• R/O
  • SSH
  • HTTPS

marathon: コミット


コミットメタ情報

リビジョン379 (tree)
日時2007-07-12 20:26:38
作者hogepiyo

ログメッセージ

*** empty log message ***

変更サマリ

差分

--- marathon/trunk/MapEditorWX/src/TextureDialog.cpp (revision 378)
+++ marathon/trunk/MapEditorWX/src/TextureDialog.cpp (revision 379)
@@ -46,7 +46,8 @@
4646 panel_13->SetMaxSize(wxSize(480, 600));
4747 panel_13->SetVirtualSize(wxSize(480, 600));
4848 panel_13->SetScrollRate(10, 10);
49- panel_13->SetScrollbars(100, 120, 5, 10);
49+ panel_13->SetScrollbars(100, 10, 5, 60);
50+ panel_13->EnableScrolling(true, true);
5051
5152 wxFlexGridSizer* grid_sizer_44 = new wxFlexGridSizer(2, 1, 0, 0);
5253 wxFlexGridSizer* grid_sizer_45 = new wxFlexGridSizer(1, 6, 0, 0);
@@ -175,6 +176,7 @@
175176 wxPaintDC dc(this);
176177
177178 wxPaintDC dcW(panel_13);
179+ //panel_13->PrepareDC(dcW);
178180 int colIndex = choice_collection->GetSelection();
179181 if(colIndex >= 0){
180182 int collection = collectionIndexTable[colIndex];
@@ -187,5 +189,7 @@
187189
188190 void TextureDialog::OnScroll(wxScrollWinEvent &event)
189191 {
192+ wxPaintEvent dummy;
193+ OnPaint(dummy);
190194 Refresh();
191195 }
--- marathon/trunk/MapEditorWX/src/TextureDialog.h (revision 378)
+++ marathon/trunk/MapEditorWX/src/TextureDialog.h (revision 379)
@@ -3,6 +3,16 @@
33
44 #include "DlgCommon.h"
55
6+class TextureArea: public wxScrolledWindow{
7+public:
8+ TextureArea(wxWindow* parent, wxWindowID id);
9+ virtual ~TextureArea();
10+protected:
11+ DECLARE_EVENT_TABLE()
12+ void OnScroll(wxScrollWinEvent &event);
13+ void OnDraw();
14+};
15+
616 class TextureDialog: public wxDialog{
717 wxStaticText* label_75;
818 wxChoice* choice_30;
--- marathon/trunk/MapEditorWX/setting.ini (revision 378)
+++ marathon/trunk/MapEditorWX/setting.ini (revision 379)
@@ -1,11 +1,4 @@
11 GRID_SIZE_INDEX=0
2-COLOR_PRESET=2
3-BACKGROUND=128,255,255
4-GRID=0,128,255
5-LINES=0,0,255
6-POLYGONS=64,128,128
7-STRINGS=0,0,64
8-POINTS=0,255,64
9-FLAGS=1,1,1,1,1,1,1,1,1,1,1,1,
10-SAME_HEIGHT_LINES=0,0,25
11-STAIR_LINES=0,100,155
2+COLOR_PRESET=1
3+BACKGROUND=0,0,0GRID=50,50,50LINES=50,255,0POLYGONS=0,50,0STRINGS=100,255,0POINTS=255,255,0SAME_HEIGHT_LINES=50,100,50STAIR_LINES=150,200,150
4+FLAGS=1,1,1,1,1,1,1,1,1,1,1,1,
\ No newline at end of file
--- marathon/trunk/HPLLib/HPLMapToolModifier.cpp (revision 378)
+++ marathon/trunk/HPLLib/HPLMapToolModifier.cpp (revision 379)
@@ -95,7 +95,7 @@
9595 #ifdef __WXDEBUG__
9696 wxASSERT(poly);
9797 #else
98- if(!poly)continue;
98+ if(!poly)return NONE;
9999 #endif
100100
101101 //以下の依存する項目を修正する
@@ -354,7 +354,7 @@
354354 #ifdef __WXDEBUG__
355355 wxASSERT(false);
356356 #else
357- return;
357+ return false;
358358 #endif
359359
360360 }
旧リポジトリブラウザで表示