*** empty log message ***
@@ -46,7 +46,8 @@ | ||
46 | 46 | panel_13->SetMaxSize(wxSize(480, 600)); |
47 | 47 | panel_13->SetVirtualSize(wxSize(480, 600)); |
48 | 48 | 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); | |
50 | 51 | |
51 | 52 | wxFlexGridSizer* grid_sizer_44 = new wxFlexGridSizer(2, 1, 0, 0); |
52 | 53 | wxFlexGridSizer* grid_sizer_45 = new wxFlexGridSizer(1, 6, 0, 0); |
@@ -175,6 +176,7 @@ | ||
175 | 176 | wxPaintDC dc(this); |
176 | 177 | |
177 | 178 | wxPaintDC dcW(panel_13); |
179 | + //panel_13->PrepareDC(dcW); | |
178 | 180 | int colIndex = choice_collection->GetSelection(); |
179 | 181 | if(colIndex >= 0){ |
180 | 182 | int collection = collectionIndexTable[colIndex]; |
@@ -187,5 +189,7 @@ | ||
187 | 189 | |
188 | 190 | void TextureDialog::OnScroll(wxScrollWinEvent &event) |
189 | 191 | { |
192 | + wxPaintEvent dummy; | |
193 | + OnPaint(dummy); | |
190 | 194 | Refresh(); |
191 | 195 | } |
@@ -3,6 +3,16 @@ | ||
3 | 3 | |
4 | 4 | #include "DlgCommon.h" |
5 | 5 | |
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 | + | |
6 | 16 | class TextureDialog: public wxDialog{ |
7 | 17 | wxStaticText* label_75; |
8 | 18 | wxChoice* choice_30; |
@@ -1,11 +1,4 @@ | ||
1 | 1 | 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 |
@@ -95,7 +95,7 @@ | ||
95 | 95 | #ifdef __WXDEBUG__ |
96 | 96 | wxASSERT(poly); |
97 | 97 | #else |
98 | - if(!poly)continue; | |
98 | + if(!poly)return NONE; | |
99 | 99 | #endif |
100 | 100 | |
101 | 101 | //以下の依存する項目を修正する |
@@ -354,7 +354,7 @@ | ||
354 | 354 | #ifdef __WXDEBUG__ |
355 | 355 | wxASSERT(false); |
356 | 356 | #else |
357 | - return; | |
357 | + return false; | |
358 | 358 | #endif |
359 | 359 | |
360 | 360 | } |