• R/O
  • SSH
  • HTTPS

marathon: コミット


コミットメタ情報

リビジョン333 (tree)
日時2007-06-15 19:37:31
作者hogepiyo

ログメッセージ

*** empty log message ***

変更サマリ

差分

--- marathon/trunk/MapEditorWX/src/AnnotationDialog.h (revision 332)
+++ marathon/trunk/MapEditorWX/src/AnnotationDialog.h (revision 333)
@@ -1,15 +1,8 @@
11 #ifndef _ANNOTATION_DIALOG_
22 #define _ANNOTATION_DIALOG_
33
4-#include "map.h"
4+#include "DlgCommon.h"
55
6-#include <wx/dialog.h>
7-#include <wx/button.h>
8-#include <wx/checkbox.h>
9-#include <wx/stattext.h>
10-#include <wx/choice.h>
11-#include <wx/textctrl.h>
12-
136 /*
147 struct map_annotation
158 {
--- marathon/trunk/MapEditorWX/src/MapEditorMainFrame.cpp (revision 332)
+++ marathon/trunk/MapEditorWX/src/MapEditorMainFrame.cpp (revision 333)
@@ -94,8 +94,13 @@
9494 //高さ制限ダイアログの表示
9595 this->heightDialog.Create(this, wxID_ANY);
9696
97- //ダブルバッファリングのバッファ用意
98-// this->createDoubleBuffer();
97+ //TODO
98+ //テスト
99+ //プラットフォームダイアログ
100+ PlatformDialog dlg;
101+ dlg.Create(this, wxID_ANY);
102+ int id = dlg.ShowModal();
103+ hpl::error::halt("%d", id);
99104 }
100105 MapEditorMainFrame::~MapEditorMainFrame()
101106 {
--- marathon/trunk/MapEditorWX/src/ColorCustomizeDialog.h (revision 332)
+++ marathon/trunk/MapEditorWX/src/ColorCustomizeDialog.h (revision 333)
@@ -1,7 +1,7 @@
11 #ifndef _COLOR_CUSTOMIZE_DIALOG_
22 #define _COLOR_CUSTOMIZE_DIALOG_
33
4-#include <wx/dialog.h>
4+#include "DlgCommon.h"
55
66 class ColorCustomizeDialog: public wxDialog{
77 public:
--- marathon/trunk/MapEditorWX/src/LevelInfoDialog.h (revision 332)
+++ marathon/trunk/MapEditorWX/src/LevelInfoDialog.h (revision 333)
@@ -1,7 +1,7 @@
11 #ifndef _LEVEL_INFO_DIALOG_
22 #define _LEVEL_INFO_DIALOG_
33
4-#include <wx/dialog.h>
4+#include "DlgCommon.h"
55
66 class LevelInfoDialog: public wxDialog{
77 public:
--- marathon/trunk/MapEditorWX/src/PlatformDialog.h (revision 332)
+++ marathon/trunk/MapEditorWX/src/PlatformDialog.h (revision 333)
@@ -1,7 +1,7 @@
11 #ifndef _PLATFORM_DIALOG_
22 #define _PLATFORM_DIALOG_
33
4-#include <wx/dialog.h>
4+#include "DlgCommon.h"
55
66 class PlatformDialog: public wxDialog{
77 public:
@@ -8,8 +8,69 @@
88 PlatformDialog();
99 bool Create(wxWindow* parent, wxWindowID id);
1010 virtual ~PlatformDialog();
11+ wxStaticBox* sizer_31_staticbox;
12+ wxStaticBox* sizer_27_staticbox;
13+ wxStaticBox* sizer_28_staticbox;
14+ wxStaticBox* sizer_19_staticbox;
15+ wxStaticBox* sizer_12_staticbox;
16+ wxStaticBox* sizer_11_staticbox;
17+ wxStaticBox* sizer_10_staticbox;
18+ wxStaticText* label_1;
19+ wxChoice* choice_1;
20+ wxStaticText* label_2;
21+ wxTextCtrl* text_ctrl_1;
22+ wxChoice* choice_2;
23+ wxStaticText* label_3;
24+ wxTextCtrl* text_ctrl_2;
25+ wxChoice* choice_3;
26+ wxCheckBox* checkbox_7;
27+ wxStaticText* label_4;
28+ wxTextCtrl* text_ctrl_3;
29+ wxCheckBox* checkbox_8;
30+ wxStaticText* label_5;
31+ wxTextCtrl* text_ctrl_4;
32+ wxCheckBox* checkbox_1;
33+ wxCheckBox* checkbox_2;
34+ wxCheckBox* checkbox_3;
35+ wxCheckBox* checkbox_4;
36+ wxCheckBox* checkbox_5;
37+ wxCheckBox* checkbox_6;
38+ wxCheckBox* checkbox_9;
39+ wxStaticText* label_6;
40+ wxChoice* choice_4;
41+ wxRadioButton* radio_btn_1;
42+ wxRadioButton* radio_btn_2;
43+ wxRadioButton* radio_btn_3;
44+ wxCheckBox* checkbox_10;
45+ wxStaticText* label_7;
46+ wxChoice* choice_5;
47+ wxCheckBox* checkbox_15;
48+ wxCheckBox* checkbox_16;
49+ wxCheckBox* checkbox_17;
50+ wxCheckBox* checkbox_18;
51+ wxCheckBox* checkbox_19;
52+ wxStaticText* label_8;
53+ wxChoice* choice_6;
54+ wxRadioButton* radio_btn_4;
55+ wxRadioButton* radio_btn_5;
56+ wxRadioButton* radio_btn_6;
57+ wxCheckBox* checkbox_12;
58+ wxCheckBox* checkbox_13;
59+ wxCheckBox* checkbox_14;
60+ wxCheckBox* checkbox_20;
61+ wxCheckBox* checkbox_21;
62+ wxCheckBox* checkbox_22;
63+ wxCheckBox* checkbox_24;
64+ wxCheckBox* checkbox_23;
65+ wxCheckBox* checkbox_25;
66+ wxCheckBox* checkbox_26;
67+ wxButton* button_1;
68+ wxButton* button_2;
69+ DECLARE_EVENT_TABLE()
1170
12- DECLARE_EVENT_TABLE()
71+ void OnOk(wxCommandEvent& ev);
72+ void OnCancel(wxCommandEvent& ev);
73+
1374 };
1475
1576 #endif
--- marathon/trunk/MapEditorWX/src/SidePropDialog.h (revision 332)
+++ marathon/trunk/MapEditorWX/src/SidePropDialog.h (revision 333)
@@ -1,7 +1,7 @@
11 #ifndef _SIDE_PROP_DIALOG_
22 #define _SIDE_PROP_DIALOG_
33
4-#include <wx/dialog.h>
4+#include "DlgCommon.h"
55
66 class SidePropDialog: public wxDialog{
77 public:
--- marathon/trunk/MapEditorWX/src/PolygonTypeDialog.h (revision 332)
+++ marathon/trunk/MapEditorWX/src/PolygonTypeDialog.h (revision 333)
@@ -1,7 +1,7 @@
11 #ifndef _POLYGON_TYPE_DIALOG_
22 #define _POLYGON_TYPE_DIALOG_
33
4-#include <wx/dialog.h>
4+#include "DlgCommon.h"
55
66 class PolygonTypeDialog: public wxDialog{
77 public:
--- marathon/trunk/MapEditorWX/src/PointPropDialog.h (revision 332)
+++ marathon/trunk/MapEditorWX/src/PointPropDialog.h (revision 333)
@@ -1,7 +1,7 @@
11 #ifndef _POINT_PROP_DIALOG_
22 #define _POINT_PROP_DIALOG_
33
4-#include <wx/dialog.h>
4+#include "DlgCommon.h"
55
66 class PointPropDialog: public wxDialog{
77 public:
--- marathon/trunk/MapEditorWX/src/VisualDialog.h (revision 332)
+++ marathon/trunk/MapEditorWX/src/VisualDialog.h (revision 333)
@@ -1,7 +1,7 @@
11 #ifndef _VISUAL_DIALOG_
22 #define _VISUAL_DIALOG_
33
4-#include <wx/dialog.h>
4+#include "DlgCommon.h"
55
66 class VisualDialog: public wxDialog{
77 public:
--- marathon/trunk/MapEditorWX/src/AnnotationDialog.cpp (revision 332)
+++ marathon/trunk/MapEditorWX/src/AnnotationDialog.cpp (revision 333)
@@ -92,10 +92,12 @@
9292 //OKボタン押した時
9393 void AnnotationDialog::OnOk(wxCommandEvent& wv)
9494 {
95+ SetReturnCode(wxID_OK);
9596 Destroy();
9697 }
9798 void AnnotationDialog::OnCancel(wxCommandEvent &ev)
9899 {
100+ SetReturnCode(wxID_CANCEL);
99101 Destroy();
100102 }
101103
--- marathon/trunk/MapEditorWX/src/HeightDialog.h (revision 332)
+++ marathon/trunk/MapEditorWX/src/HeightDialog.h (revision 333)
@@ -1,16 +1,15 @@
11 #ifndef _HEIGHT_DIALOG_
22 #define _HEIGHT_DIALOG_
33
4-#include <wx/dialog.h>
5-#include <wx/checkbox.h>
6-#include <wx/slider.h>
7-#include <wx/textctrl.h>
4+#include "DlgCommon.h"
85
96 class HeightDialog: public wxDialog{
107 protected:
8+ wxStaticText* label_9;
119 wxTextCtrl* text_ctrl_5;
1210 wxSlider* slider_2;
1311 wxSlider* slider_3;
12+ wxStaticText* label_10;
1413 wxTextCtrl* text_ctrl_6;
1514 wxCheckBox* checkbox_11;
1615 public:
--- marathon/trunk/MapEditorWX/src/EditorPreferencesDialog.h (revision 332)
+++ marathon/trunk/MapEditorWX/src/EditorPreferencesDialog.h (revision 333)
@@ -1,7 +1,7 @@
11 #ifndef _EDITOR_PREFERENCES_DIALOG_
22 #define _EDITOR_PREFERENCES_DIALOG_
33
4-#include <wx/dialog.h>
4+#include "DlgCommon.h"
55
66 class EditorPreferencesDialog: public wxDialog{
77 public:
--- marathon/trunk/MapEditorWX/src/HeightPalletDialog.h (revision 332)
+++ marathon/trunk/MapEditorWX/src/HeightPalletDialog.h (revision 333)
@@ -1,7 +1,7 @@
11 #ifndef _HEIGHT_PALLET_DIALOG_
22 #define _HEIGHT_PALLET_DIALOG_
33
4-#include <wx/dialog.h>
4+#include "DlgCommon.h"
55
66 class HeightPalletDialog: public wxDialog{
77 public:
--- marathon/trunk/MapEditorWX/src/ToolDialog.h (revision 332)
+++ marathon/trunk/MapEditorWX/src/ToolDialog.h (revision 333)
@@ -1,12 +1,7 @@
11 #ifndef _TOOL_DIALOG_
22 #define _TOOL_DIALOG_
33
4-#include <wx/dialog.h>
5-#include <wx/bitmap.h>
6-#include <wx/image.h>
7-#include <wx/bmpbuttn.h>
8-#include "HPLLib/HPLEventManager.h"
9-#include <string>
4+#include "DlgCommon.h"
105
116 /**
127 ツール選択ダイアログ
--- marathon/trunk/MapEditorWX/src/PlatformDialog.cpp (revision 332)
+++ marathon/trunk/MapEditorWX/src/PlatformDialog.cpp (revision 333)
@@ -1,6 +1,8 @@
11 #include "PlatformDialog.h"
22 #include "MapEditorWX.h"
33 BEGIN_EVENT_TABLE(PlatformDialog, wxDialog)
4+ EVT_BUTTON(wxID_OK, PlatformDialog::OnOk)
5+ EVT_BUTTON(wxID_CANCEL, PlatformDialog::OnCancel)
46 END_EVENT_TABLE()
57 PlatformDialog::PlatformDialog()
68 {
@@ -12,5 +14,216 @@
1214 {
1315 bool result = wxDialog::Create(parent, id, _T("Platform"));
1416
17+ //create
18+ sizer_11_staticbox = new wxStaticBox(this, -1, wxT("Controlled by"));
19+ sizer_12_staticbox = new wxStaticBox(this, -1, wxT("When Bites"));
20+ sizer_19_staticbox = new wxStaticBox(this, -1, wxT("Open"));
21+ sizer_28_staticbox = new wxStaticBox(this, -1, wxT("Activates"));
22+ sizer_27_staticbox = new wxStaticBox(this, -1, wxT("Deactivates"));
23+ sizer_31_staticbox = new wxStaticBox(this, -1, wxT("Misc"));
24+ sizer_10_staticbox = new wxStaticBox(this, -1, wxT("Initially"));
25+ label_1 = new wxStaticText(this, wxID_ANY, wxT("Type"));
26+ /*const wxString choice_1_choices[] = {
27+
28+ };*/
29+ choice_1 = new wxChoice(this, wxID_ANY);//, wxDefaultPosition, wxDefaultSize, 0, choice_1_choices, 0);
30+ label_2 = new wxStaticText(this, wxID_ANY, wxT("Speed"));
31+ text_ctrl_1 = new wxTextCtrl(this, wxID_ANY, wxEmptyString);
32+ /*const wxString choice_2_choices[] = {
33+
34+ };*/
35+ choice_2 = new wxChoice(this, wxID_ANY);//, wxDefaultPosition, wxDefaultSize, 0, choice_2_choices, 0);
36+ label_3 = new wxStaticText(this, wxID_ANY, wxT("Delay"));
37+ text_ctrl_2 = new wxTextCtrl(this, wxID_ANY, wxEmptyString);
38+ /*const wxString choice_3_choices[] = {
39+
40+ };*/
41+ choice_3 = new wxChoice(this, wxID_ANY);//, wxDefaultPosition, wxDefaultSize, 0, choice_3_choices, 0);
42+ checkbox_7 = new wxCheckBox(this, wxID_ANY, wxT("Auto Calc Min Height"));
43+ label_4 = new wxStaticText(this, wxID_ANY, wxT("Min Height"));
44+ text_ctrl_3 = new wxTextCtrl(this, wxID_ANY, wxEmptyString);
45+ checkbox_8 = new wxCheckBox(this, wxID_ANY, wxT("Auto Clac Max Height"));
46+ label_5 = new wxStaticText(this, wxID_ANY, wxT("Max Height"));
47+ text_ctrl_4 = new wxTextCtrl(this, wxID_ANY, wxEmptyString);
48+ checkbox_1 = new wxCheckBox(this, wxID_ANY, wxT("Active"));
49+ checkbox_2 = new wxCheckBox(this, wxID_ANY, wxT("Opened"));
50+ checkbox_3 = new wxCheckBox(this, wxID_ANY, wxT("Player"));
51+ checkbox_4 = new wxCheckBox(this, wxID_ANY, wxT("Aliens"));
52+ checkbox_5 = new wxCheckBox(this, wxID_ANY, wxT("Causes Damage"));
53+ checkbox_6 = new wxCheckBox(this, wxID_ANY, wxT("Reverse"));
54+ checkbox_9 = new wxCheckBox(this, wxID_ANY, wxT("Door"));
55+ label_6 = new wxStaticText(this, wxID_ANY, wxT("Default Preset"));
56+/* const wxString choice_4_choices[] = {
57+
58+ };*/
59+ choice_4 = new wxChoice(this, wxID_ANY);//, wxDefaultPosition, wxDefaultSize, 0, choice_4_choices, 0);
60+ radio_btn_1 = new wxRadioButton(this, wxID_ANY, wxT("From Floor"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP);
61+ radio_btn_2 = new wxRadioButton(this, wxID_ANY, wxT("From Ceiling"));
62+ radio_btn_3 = new wxRadioButton(this, wxID_ANY, wxT("From Both"));
63+ checkbox_10 = new wxCheckBox(this, wxID_ANY, wxT("Floor to Ceiling"));
64+ label_7 = new wxStaticText(this, wxID_ANY, wxT("Copy from"));
65+/* const wxString choice_5_choices[] = {
66+
67+ };*/
68+ choice_5 = new wxChoice(this, wxID_ANY);//, wxDefaultPosition, wxDefaultSize, 0, choice_5_choices, 0);
69+ checkbox_15 = new wxCheckBox(this, wxID_ANY, wxT("Only once"));
70+ checkbox_16 = new wxCheckBox(this, wxID_ANY, wxT("Activates polygon lights"));
71+ checkbox_17 = new wxCheckBox(this, wxID_ANY, wxT("Activates adjacent polygon"));
72+ checkbox_18 = new wxCheckBox(this, wxID_ANY, wxT("Deactivates adjacent polygon"));
73+ checkbox_19 = new wxCheckBox(this, wxID_ANY, wxT("Adjacent at each level"));
74+ label_8 = new wxStaticText(this, wxID_ANY, wxT("Tag"));
75+/* const wxString choice_6_choices[] = {
76+
77+ };*/
78+ choice_6 = new wxChoice(this, wxID_ANY);//, wxDefaultPosition, wxDefaultSize, 0, choice_6_choices, 0);
79+ radio_btn_4 = new wxRadioButton(this, wxID_ANY, wxT("Never"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP);
80+ radio_btn_5 = new wxRadioButton(this, wxID_ANY, wxT("At each level"));
81+ radio_btn_6 = new wxRadioButton(this, wxID_ANY, wxT("At initial level"));
82+ checkbox_12 = new wxCheckBox(this, wxID_ANY, wxT("Deactivates polygon lights"));
83+ checkbox_13 = new wxCheckBox(this, wxID_ANY, wxT("Deactivates adjacent platform"));
84+ checkbox_14 = new wxCheckBox(this, wxID_ANY, wxT("Activates adjacent platform"));
85+ checkbox_20 = new wxCheckBox(this, wxID_ANY, wxT("Can't deactivate extenally"));
86+ checkbox_21 = new wxCheckBox(this, wxID_ANY, wxT("Uses native polygon heights"));
87+ checkbox_22 = new wxCheckBox(this, wxID_ANY, wxT("Delay befire activation"));
88+ checkbox_24 = new wxCheckBox(this, wxID_ANY, wxT("Doesn't activate parent"));
89+ checkbox_23 = new wxCheckBox(this, wxID_ANY, wxT("Contracts slower"));
90+ checkbox_25 = new wxCheckBox(this, wxID_ANY, wxT("Locked"));
91+ checkbox_26 = new wxCheckBox(this, wxID_ANY, wxT("Secret"));
92+ button_1 = new wxButton(this, wxID_OK, wxT("OK"));
93+ button_2 = new wxButton(this, wxID_CANCEL, wxT("Cancel"));
94+
95+ //prefs
96+ label_2->SetMinSize(wxSize(35, 14));
97+ text_ctrl_1->SetMinSize(wxSize(60, -1));
98+ choice_2->SetMinSize(wxSize(80, -1));
99+ label_3->SetMinSize(wxSize(35, 14));
100+ text_ctrl_2->SetMinSize(wxSize(60, -1));
101+ choice_3->SetMinSize(wxSize(90, -1));
102+ label_4->SetMinSize(wxSize(61, 14));
103+ label_5->SetMinSize(wxSize(61, 14));
104+
105+ //layout
106+ wxFlexGridSizer* sizer_1 = new wxFlexGridSizer(2, 1, 0, 0);
107+ wxBoxSizer* sizer_21 = new wxBoxSizer(wxHORIZONTAL);
108+ wxFlexGridSizer* sizer_30 = new wxFlexGridSizer(2, 1, 0, 0);
109+ wxFlexGridSizer* sizer_32 = new wxFlexGridSizer(1, 2, 0, 0);
110+ wxStaticBoxSizer* sizer_31 = new wxStaticBoxSizer(sizer_31_staticbox, wxVERTICAL);
111+ wxStaticBoxSizer* sizer_27 = new wxStaticBoxSizer(sizer_27_staticbox, wxVERTICAL);
112+ wxFlexGridSizer* sizer_26 = new wxFlexGridSizer(2, 1, 0, 0);
113+ wxFlexGridSizer* sizer_29 = new wxFlexGridSizer(1, 2, 0, 0);
114+ wxStaticBoxSizer* sizer_28 = new wxStaticBoxSizer(sizer_28_staticbox, wxVERTICAL);
115+ wxBoxSizer* sizer_2 = new wxBoxSizer(wxHORIZONTAL);
116+ wxFlexGridSizer* sizer_16 = new wxFlexGridSizer(3, 1, 0, 0);
117+ wxBoxSizer* sizer_18 = new wxBoxSizer(wxHORIZONTAL);
118+ wxBoxSizer* sizer_20 = new wxBoxSizer(wxVERTICAL);
119+ wxStaticBoxSizer* sizer_19 = new wxStaticBoxSizer(sizer_19_staticbox, wxVERTICAL);
120+ wxBoxSizer* sizer_17 = new wxBoxSizer(wxHORIZONTAL);
121+ wxFlexGridSizer* sizer_3 = new wxFlexGridSizer(2, 1, 0, 0);
122+ wxBoxSizer* sizer_4 = new wxBoxSizer(wxHORIZONTAL);
123+ wxStaticBoxSizer* sizer_12 = new wxStaticBoxSizer(sizer_12_staticbox, wxVERTICAL);
124+ wxStaticBoxSizer* sizer_11 = new wxStaticBoxSizer(sizer_11_staticbox, wxVERTICAL);
125+ wxStaticBoxSizer* sizer_10 = new wxStaticBoxSizer(sizer_10_staticbox, wxVERTICAL);
126+ wxBoxSizer* sizer_5 = new wxBoxSizer(wxHORIZONTAL);
127+ wxBoxSizer* sizer_13 = new wxBoxSizer(wxVERTICAL);
128+ wxBoxSizer* sizer_15 = new wxBoxSizer(wxHORIZONTAL);
129+ wxBoxSizer* sizer_14 = new wxBoxSizer(wxHORIZONTAL);
130+ wxBoxSizer* sizer_6 = new wxBoxSizer(wxVERTICAL);
131+ wxBoxSizer* sizer_9 = new wxBoxSizer(wxHORIZONTAL);
132+ wxBoxSizer* sizer_8 = new wxBoxSizer(wxHORIZONTAL);
133+ wxFlexGridSizer* sizer_7 = new wxFlexGridSizer(1, 2, 0, 0);
134+ sizer_7->Add(label_1, 0, 0, 0);
135+ sizer_7->Add(choice_1, 0, 0, 0);
136+ sizer_6->Add(sizer_7, 1, wxEXPAND, 0);
137+ sizer_8->Add(label_2, 0, 0, 0);
138+ sizer_8->Add(text_ctrl_1, 0, 0, 0);
139+ sizer_8->Add(choice_2, 0, 0, 0);
140+ sizer_6->Add(sizer_8, 1, 0, 0);
141+ sizer_9->Add(label_3, 0, 0, 0);
142+ sizer_9->Add(text_ctrl_2, 0, 0, 0);
143+ sizer_9->Add(choice_3, 0, 0, 0);
144+ sizer_6->Add(sizer_9, 1, 0, 0);
145+ sizer_5->Add(sizer_6, 1, wxEXPAND, 0);
146+ sizer_13->Add(checkbox_7, 0, 0, 0);
147+ sizer_14->Add(label_4, 0, 0, 0);
148+ sizer_14->Add(text_ctrl_3, 0, 0, 0);
149+ sizer_13->Add(sizer_14, 1, 0, 0);
150+ sizer_13->Add(checkbox_8, 0, 0, 0);
151+ sizer_15->Add(label_5, 0, 0, 0);
152+ sizer_15->Add(text_ctrl_4, 0, 0, 0);
153+ sizer_13->Add(sizer_15, 1, 0, 0);
154+ sizer_5->Add(sizer_13, 1, 0, 0);
155+ sizer_3->Add(sizer_5, 1, wxEXPAND, 0);
156+ sizer_10->Add(checkbox_1, 0, 0, 0);
157+ sizer_10->Add(checkbox_2, 0, 0, 0);
158+ sizer_4->Add(sizer_10, 1, wxEXPAND, 0);
159+ sizer_11->Add(checkbox_3, 0, 0, 0);
160+ sizer_11->Add(checkbox_4, 0, 0, 0);
161+ sizer_4->Add(sizer_11, 1, wxEXPAND, 0);
162+ sizer_12->Add(checkbox_5, 0, 0, 0);
163+ sizer_12->Add(checkbox_6, 0, 0, 0);
164+ sizer_4->Add(sizer_12, 1, wxEXPAND, 0);
165+ sizer_3->Add(sizer_4, 1, wxEXPAND, 0);
166+ sizer_2->Add(sizer_3, 1, wxEXPAND, 0);
167+ sizer_16->Add(checkbox_9, 0, 0, 0);
168+ sizer_17->Add(label_6, 0, 0, 0);
169+ sizer_17->Add(choice_4, 0, 0, 0);
170+ sizer_16->Add(sizer_17, 1, wxEXPAND, 0);
171+ sizer_19->Add(radio_btn_1, 0, 0, 0);
172+ sizer_19->Add(radio_btn_2, 0, 0, 0);
173+ sizer_19->Add(radio_btn_3, 0, 0, 0);
174+ sizer_19->Add(checkbox_10, 0, 0, 0);
175+ sizer_18->Add(sizer_19, 1, wxEXPAND, 0);
176+ sizer_20->Add(label_7, 0, 0, 0);
177+ sizer_20->Add(choice_5, 0, 0, 0);
178+ sizer_18->Add(sizer_20, 1, wxEXPAND, 0);
179+ sizer_16->Add(sizer_18, 1, wxEXPAND, 0);
180+ sizer_2->Add(sizer_16, 1, wxEXPAND, 0);
181+ sizer_1->Add(sizer_2, 1, wxEXPAND, 0);
182+ sizer_28->Add(checkbox_15, 0, 0, 0);
183+ sizer_28->Add(checkbox_16, 0, 0, 0);
184+ sizer_28->Add(checkbox_17, 0, 0, 0);
185+ sizer_28->Add(checkbox_18, 0, 0, 0);
186+ sizer_28->Add(checkbox_19, 0, 0, 0);
187+ sizer_26->Add(sizer_28, 1, wxEXPAND, 0);
188+ sizer_29->Add(label_8, 0, 0, 0);
189+ sizer_29->Add(choice_6, 0, 0, 0);
190+ sizer_26->Add(sizer_29, 1, wxEXPAND, 0);
191+ sizer_21->Add(sizer_26, 1, wxEXPAND, 0);
192+ sizer_27->Add(radio_btn_4, 0, 0, 0);
193+ sizer_27->Add(radio_btn_5, 0, 0, 0);
194+ sizer_27->Add(radio_btn_6, 0, 0, 0);
195+ sizer_27->Add(checkbox_12, 0, 0, 0);
196+ sizer_27->Add(checkbox_13, 0, 0, 0);
197+ sizer_27->Add(checkbox_14, 0, 0, 0);
198+ sizer_21->Add(sizer_27, 1, wxEXPAND, 0);
199+ sizer_31->Add(checkbox_20, 0, 0, 0);
200+ sizer_31->Add(checkbox_21, 0, 0, 0);
201+ sizer_31->Add(checkbox_22, 0, 0, 0);
202+ sizer_31->Add(checkbox_24, 0, 0, 0);
203+ sizer_31->Add(checkbox_23, 0, 0, 0);
204+ sizer_31->Add(checkbox_25, 0, 0, 0);
205+ sizer_31->Add(checkbox_26, 0, 0, 0);
206+ sizer_30->Add(sizer_31, 1, wxEXPAND, 0);
207+ sizer_32->Add(button_1, 0, 0, 0);
208+ sizer_32->Add(button_2, 0, 0, 0);
209+ sizer_30->Add(sizer_32, 1, wxEXPAND, 0);
210+ sizer_21->Add(sizer_30, 1, 0, 0);
211+ sizer_1->Add(sizer_21, 1, wxEXPAND, 0);
212+ SetSizer(sizer_1);
213+ sizer_1->Fit(this);
214+ Layout();
215+
15216 return result;
16217 }
218+
219+void PlatformDialog::OnOk(wxCommandEvent& ev)
220+{
221+ SetReturnCode(wxID_OK);
222+ Destroy();
223+}
224+void PlatformDialog::OnCancel(wxCommandEvent& ev)
225+{
226+ //
227+ SetReturnCode(wxID_CANCEL);
228+ Destroy();
229+}
--- marathon/trunk/MapEditorWX/src/res/Dialogues.h (revision 332)
+++ marathon/trunk/MapEditorWX/src/res/Dialogues.h (revision 333)
@@ -1,4 +1,4 @@
1-// -*- C++ -*- generated by wxGlade 0.5 on Thu Jun 14 22:31:15 2007 from C:\Documents and Settings\koji\My Documents\saved_\repository_\marathon\MapEditorWX\src\res\MapEditorWX.wxg
1+// -*- C++ -*- generated by wxGlade 0.5 on Fri Jun 15 14:25:30 2007 from C:\0save\marathon\MapEditorWX\src\res\MapEditorWX.wxg
22
33 #include <wx/wx.h>
44 #include <wx/image.h>
@@ -118,4 +118,107 @@
118118 }; // wxGlade: end class
119119
120120
121+class AnnotationDialog: public wxDialog {
122+public:
123+ // begin wxGlade: AnnotationDialog::ids
124+ // end wxGlade
125+
126+ AnnotationDialog(wxWindow* parent, int id, const wxString& title, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=wxDEFAULT_DIALOG_STYLE);
127+
128+private:
129+ // begin wxGlade: AnnotationDialog::methods
130+ void set_properties();
131+ void do_layout();
132+ // end wxGlade
133+
134+protected:
135+ // begin wxGlade: AnnotationDialog::attributes
136+ wxStaticText* label_12;
137+ wxChoice* choice_8;
138+ wxTextCtrl* text_ctrl_7;
139+ wxStaticText* label_11;
140+ wxChoice* choice_7;
141+ wxButton* button_3;
142+ wxButton* button_4;
143+ // end wxGlade
144+}; // wxGlade: end class
145+
146+
147+class ColorCustomize: public wxDialog {
148+public:
149+ // begin wxGlade: ColorCustomize::ids
150+ // end wxGlade
151+
152+ ColorCustomize(wxWindow* parent, int id, const wxString& title, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=wxDEFAULT_DIALOG_STYLE);
153+
154+private:
155+ // begin wxGlade: ColorCustomize::methods
156+ void set_properties();
157+ void do_layout();
158+ // end wxGlade
159+
160+protected:
161+ // begin wxGlade: ColorCustomize::attributes
162+ wxStaticText* label_13;
163+ wxButton* button_7;
164+ wxPanel* panel_1;
165+ wxStaticText* label_14;
166+ wxButton* button_8;
167+ wxPanel* panel_2;
168+ wxStaticText* label_16;
169+ wxButton* button_9;
170+ wxPanel* panel_3;
171+ wxStaticText* label_15;
172+ wxButton* button_10;
173+ wxPanel* panel_4;
174+ wxStaticText* label_17;
175+ wxButton* button_11;
176+ wxPanel* panel_5;
177+ wxStaticText* label_18;
178+ wxButton* button_12;
179+ wxPanel* panel_6;
180+ wxButton* button_5;
181+ wxButton* button_6;
182+ // end wxGlade
183+}; // wxGlade: end class
184+
185+
186+class EditorPreferences: public wxDialog {
187+public:
188+ // begin wxGlade: EditorPreferences::ids
189+ // end wxGlade
190+
191+ EditorPreferences(wxWindow* parent, int id, const wxString& title, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=wxDEFAULT_DIALOG_STYLE);
192+
193+private:
194+ // begin wxGlade: EditorPreferences::methods
195+ void set_properties();
196+ void do_layout();
197+ // end wxGlade
198+
199+protected:
200+ // begin wxGlade: EditorPreferences::attributes
201+ wxStaticText* label_19;
202+ wxChoice* choice_9;
203+ wxCheckBox* checkbox_27;
204+ wxCheckBox* checkbox_28;
205+ wxCheckBox* checkbox_31;
206+ wxCheckBox* checkbox_30;
207+ wxCheckBox* checkbox_32;
208+ wxCheckBox* checkbox_33;
209+ wxCheckBox* checkbox_34;
210+ wxCheckBox* checkbox_35;
211+ wxCheckBox* checkbox_36;
212+ wxCheckBox* checkbox_29;
213+ wxStaticText* label_20;
214+ wxChoice* choice_10;
215+ wxCheckBox* checkbox_37;
216+ wxCheckBox* checkbox_38;
217+ wxButton* button_15;
218+ wxButton* button_13;
219+ wxButton* button_14;
220+ // end wxGlade
221+}; // wxGlade: end class
222+
223+
121224 #endif // DIALOGUES_H
--- marathon/trunk/MapEditorWX/src/res/Dialogues.cpp (revision 332)
+++ marathon/trunk/MapEditorWX/src/res/Dialogues.cpp (revision 333)
@@ -1,4 +1,4 @@
1-// -*- C++ -*- generated by wxGlade 0.5 on Thu Jun 14 22:31:15 2007 from C:\Documents and Settings\koji\My Documents\saved_\repository_\marathon\MapEditorWX\src\res\MapEditorWX.wxg
1+// -*- C++ -*- generated by wxGlade 0.5 on Fri Jun 15 14:25:30 2007 from C:\0save\marathon\MapEditorWX\src\res\MapEditorWX.wxg
22
33 #include "Dialogues.h"
44
@@ -126,22 +126,22 @@
126126 void wxDialog::do_layout()
127127 {
128128 // begin wxGlade: wxDialog::do_layout
129- wxFlexGridSizer* sizer_1 = new wxFlexGridSizer(1, 2, 0, 0);
129+ wxFlexGridSizer* sizer_1 = new wxFlexGridSizer(2, 1, 0, 0);
130130 wxBoxSizer* sizer_21 = new wxBoxSizer(wxHORIZONTAL);
131- wxBoxSizer* sizer_30 = new wxBoxSizer(wxVERTICAL);
131+ wxFlexGridSizer* sizer_30 = new wxFlexGridSizer(2, 1, 0, 0);
132132 wxFlexGridSizer* sizer_32 = new wxFlexGridSizer(1, 2, 0, 0);
133133 wxStaticBoxSizer* sizer_31 = new wxStaticBoxSizer(sizer_31_staticbox, wxVERTICAL);
134134 wxStaticBoxSizer* sizer_27 = new wxStaticBoxSizer(sizer_27_staticbox, wxVERTICAL);
135- wxBoxSizer* sizer_26 = new wxBoxSizer(wxVERTICAL);
135+ wxFlexGridSizer* sizer_26 = new wxFlexGridSizer(2, 1, 0, 0);
136136 wxFlexGridSizer* sizer_29 = new wxFlexGridSizer(1, 2, 0, 0);
137137 wxStaticBoxSizer* sizer_28 = new wxStaticBoxSizer(sizer_28_staticbox, wxVERTICAL);
138138 wxBoxSizer* sizer_2 = new wxBoxSizer(wxHORIZONTAL);
139- wxFlexGridSizer* sizer_16 = new wxFlexGridSizer(1, 3, 0, 0);
139+ wxFlexGridSizer* sizer_16 = new wxFlexGridSizer(3, 1, 0, 0);
140140 wxBoxSizer* sizer_18 = new wxBoxSizer(wxHORIZONTAL);
141141 wxBoxSizer* sizer_20 = new wxBoxSizer(wxVERTICAL);
142142 wxStaticBoxSizer* sizer_19 = new wxStaticBoxSizer(sizer_19_staticbox, wxVERTICAL);
143143 wxBoxSizer* sizer_17 = new wxBoxSizer(wxHORIZONTAL);
144- wxFlexGridSizer* sizer_3 = new wxFlexGridSizer(1, 2, 0, 0);
144+ wxFlexGridSizer* sizer_3 = new wxFlexGridSizer(2, 1, 0, 0);
145145 wxBoxSizer* sizer_4 = new wxBoxSizer(wxHORIZONTAL);
146146 wxStaticBoxSizer* sizer_12 = new wxStaticBoxSizer(sizer_12_staticbox, wxVERTICAL);
147147 wxStaticBoxSizer* sizer_11 = new wxStaticBoxSizer(sizer_11_staticbox, wxVERTICAL);
@@ -292,3 +292,231 @@
292292 // end wxGlade
293293 }
294294
295+
296+AnnotationDialog::AnnotationDialog(wxWindow* parent, int id, const wxString& title, const wxPoint& pos, const wxSize& size, long style):
297+ wxDialog(parent, id, title, pos, size, wxDEFAULT_DIALOG_STYLE)
298+{
299+ // begin wxGlade: AnnotationDialog::AnnotationDialog
300+ label_12 = new wxStaticText(this, wxID_ANY, wxT("Type"));
301+ const wxString choice_8_choices[] = {
302+ wxT("Normal")
303+ };
304+ choice_8 = new wxChoice(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 1, choice_8_choices, 0);
305+ text_ctrl_7 = new wxTextCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxHSCROLL);
306+ label_11 = new wxStaticText(this, wxID_ANY, wxT("Dependency polygon index"));
307+ const wxString choice_7_choices[] = {
308+
309+ };
310+ choice_7 = new wxChoice(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, choice_7_choices, 0);
311+ button_3 = new wxButton(this, wxID_ANY, wxT("OK"));
312+ button_4 = new wxButton(this, wxID_ANY, wxT("Cancel"));
313+
314+ set_properties();
315+ do_layout();
316+ // end wxGlade
317+}
318+
319+
320+void AnnotationDialog::set_properties()
321+{
322+ // begin wxGlade: AnnotationDialog::set_properties
323+ SetTitle(wxT("dialog_3"));
324+ choice_8->SetSelection(0);
325+ text_ctrl_7->SetMinSize(wxSize(250, 60));
326+ // end wxGlade
327+}
328+
329+
330+void AnnotationDialog::do_layout()
331+{
332+ // begin wxGlade: AnnotationDialog::do_layout
333+ wxFlexGridSizer* sizer_33 = new wxFlexGridSizer(4, 1, 0, 0);
334+ wxBoxSizer* sizer_34 = new wxBoxSizer(wxHORIZONTAL);
335+ wxBoxSizer* sizer_35 = new wxBoxSizer(wxHORIZONTAL);
336+ wxBoxSizer* sizer_36 = new wxBoxSizer(wxHORIZONTAL);
337+ sizer_36->Add(label_12, 0, 0, 0);
338+ sizer_36->Add(choice_8, 0, 0, 0);
339+ sizer_33->Add(sizer_36, 1, wxEXPAND, 0);
340+ sizer_33->Add(text_ctrl_7, 0, wxEXPAND, 0);
341+ sizer_35->Add(label_11, 0, 0, 0);
342+ sizer_35->Add(choice_7, 0, 0, 0);
343+ sizer_33->Add(sizer_35, 1, wxEXPAND, 0);
344+ sizer_34->Add(button_3, 0, 0, 0);
345+ sizer_34->Add(button_4, 0, 0, 0);
346+ sizer_33->Add(sizer_34, 1, wxEXPAND, 0);
347+ SetSizer(sizer_33);
348+ sizer_33->Fit(this);
349+ Layout();
350+ // end wxGlade
351+}
352+
353+
354+ColorCustomize::ColorCustomize(wxWindow* parent, int id, const wxString& title, const wxPoint& pos, const wxSize& size, long style):
355+ wxDialog(parent, id, title, pos, size, wxDEFAULT_DIALOG_STYLE)
356+{
357+ // begin wxGlade: ColorCustomize::ColorCustomize
358+ label_13 = new wxStaticText(this, wxID_ANY, wxT("Background"));
359+ button_7 = new wxButton(this, wxID_ANY, wxT("Choose color"));
360+ panel_1 = new wxPanel(this, wxID_ANY);
361+ label_14 = new wxStaticText(this, wxID_ANY, wxT("Grid line"));
362+ button_8 = new wxButton(this, wxID_ANY, wxT("Choose color"));
363+ panel_2 = new wxPanel(this, wxID_ANY);
364+ label_16 = new wxStaticText(this, wxID_ANY, wxT("Lines"));
365+ button_9 = new wxButton(this, wxID_ANY, wxT("Choose color"));
366+ panel_3 = new wxPanel(this, wxID_ANY);
367+ label_15 = new wxStaticText(this, wxID_ANY, wxT("Polygons"));
368+ button_10 = new wxButton(this, wxID_ANY, wxT("Choose color"));
369+ panel_4 = new wxPanel(this, wxID_ANY);
370+ label_17 = new wxStaticText(this, wxID_ANY, wxT("Strings"));
371+ button_11 = new wxButton(this, wxID_ANY, wxT("Choose color"));
372+ panel_5 = new wxPanel(this, wxID_ANY);
373+ label_18 = new wxStaticText(this, wxID_ANY, wxT("Points"));
374+ button_12 = new wxButton(this, wxID_ANY, wxT("Choose color"));
375+ panel_6 = new wxPanel(this, wxID_ANY);
376+ button_5 = new wxButton(this, wxID_ANY, wxT("OK"));
377+ button_6 = new wxButton(this, wxID_ANY, wxT("Cancel"));
378+
379+ set_properties();
380+ do_layout();
381+ // end wxGlade
382+}
383+
384+
385+void ColorCustomize::set_properties()
386+{
387+ // begin wxGlade: ColorCustomize::set_properties
388+ SetTitle(wxT("dialog_4"));
389+ // end wxGlade
390+}
391+
392+
393+void ColorCustomize::do_layout()
394+{
395+ // begin wxGlade: ColorCustomize::do_layout
396+ wxFlexGridSizer* sizer_37 = new wxFlexGridSizer(7, 1, 0, 0);
397+ wxBoxSizer* sizer_44 = new wxBoxSizer(wxHORIZONTAL);
398+ wxGridSizer* sizer_43 = new wxGridSizer(1, 3, 0, 0);
399+ wxGridSizer* sizer_42 = new wxGridSizer(1, 3, 0, 0);
400+ wxGridSizer* sizer_41 = new wxGridSizer(1, 3, 0, 0);
401+ wxGridSizer* sizer_40 = new wxGridSizer(1, 3, 0, 0);
402+ wxGridSizer* sizer_39 = new wxGridSizer(1, 3, 0, 0);
403+ wxGridSizer* sizer_38 = new wxGridSizer(1, 3, 0, 0);
404+ sizer_38->Add(label_13, 0, 0, 0);
405+ sizer_38->Add(button_7, 0, 0, 0);
406+ sizer_38->Add(panel_1, 1, wxEXPAND, 0);
407+ sizer_37->Add(sizer_38, 1, wxEXPAND, 0);
408+ sizer_39->Add(label_14, 0, 0, 0);
409+ sizer_39->Add(button_8, 0, 0, 0);
410+ sizer_39->Add(panel_2, 1, 0, 0);
411+ sizer_37->Add(sizer_39, 1, wxEXPAND, 0);
412+ sizer_40->Add(label_16, 0, 0, 0);
413+ sizer_40->Add(button_9, 0, 0, 0);
414+ sizer_40->Add(panel_3, 1, wxEXPAND, 0);
415+ sizer_37->Add(sizer_40, 1, wxEXPAND, 0);
416+ sizer_41->Add(label_15, 0, 0, 0);
417+ sizer_41->Add(button_10, 0, 0, 0);
418+ sizer_41->Add(panel_4, 1, wxEXPAND, 0);
419+ sizer_37->Add(sizer_41, 1, wxEXPAND, 0);
420+ sizer_42->Add(label_17, 0, 0, 0);
421+ sizer_42->Add(button_11, 0, 0, 0);
422+ sizer_42->Add(panel_5, 1, wxEXPAND, 0);
423+ sizer_37->Add(sizer_42, 1, wxEXPAND, 0);
424+ sizer_43->Add(label_18, 0, 0, 0);
425+ sizer_43->Add(button_12, 0, 0, 0);
426+ sizer_43->Add(panel_6, 1, wxEXPAND, 0);
427+ sizer_37->Add(sizer_43, 1, wxEXPAND, 0);
428+ sizer_44->Add(button_5, 0, 0, 0);
429+ sizer_44->Add(button_6, 0, 0, 0);
430+ sizer_37->Add(sizer_44, 1, wxEXPAND, 0);
431+ SetSizer(sizer_37);
432+ sizer_37->Fit(this);
433+ Layout();
434+ // end wxGlade
435+}
436+
437+
438+EditorPreferences::EditorPreferences(wxWindow* parent, int id, const wxString& title, const wxPoint& pos, const wxSize& size, long style):
439+ wxDialog(parent, id, title, pos, size, wxDEFAULT_DIALOG_STYLE)
440+{
441+ // begin wxGlade: EditorPreferences::EditorPreferences
442+ label_19 = new wxStaticText(this, wxID_ANY, wxT("Grid size"));
443+ const wxString choice_9_choices[] = {
444+
445+ };
446+ choice_9 = new wxChoice(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, choice_9_choices, 0);
447+ checkbox_27 = new wxCheckBox(this, wxID_ANY, wxT("Show grid"));
448+ checkbox_28 = new wxCheckBox(this, wxID_ANY, wxT("Fit to grid"));
449+ checkbox_31 = new wxCheckBox(this, wxID_ANY, wxT("Show monsters"));
450+ checkbox_30 = new wxCheckBox(this, wxID_ANY, wxT("Show items"));
451+ checkbox_32 = new wxCheckBox(this, wxID_ANY, wxT("Show scenery"));
452+ checkbox_33 = new wxCheckBox(this, wxID_ANY, wxT("Show players"));
453+ checkbox_34 = new wxCheckBox(this, wxID_ANY, wxT("Show goals"));
454+ checkbox_35 = new wxCheckBox(this, wxID_ANY, wxT("Show sounds"));
455+ checkbox_36 = new wxCheckBox(this, wxID_ANY, wxT("Show annotations"));
456+ checkbox_29 = new wxCheckBox(this, wxID_ANY, wxT("Visual mode-Crossfair"));
457+ label_20 = new wxStaticText(this, wxID_ANY, wxT("Color set"));
458+ const wxString choice_10_choices[] = {
459+
460+ };
461+ choice_10 = new wxChoice(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, choice_10_choices, 0);
462+ checkbox_37 = new wxCheckBox(this, wxID_ANY, wxT("Show polygons"));
463+ checkbox_38 = new wxCheckBox(this, wxID_ANY, wxT("Show lines"));
464+ button_15 = new wxButton(this, wxID_ANY, wxT("Set as default"));
465+ button_13 = new wxButton(this, wxID_ANY, wxT("OK"));
466+ button_14 = new wxButton(this, wxID_ANY, wxT("Cancel"));
467+
468+ set_properties();
469+ do_layout();
470+ // end wxGlade
471+}
472+
473+
474+void EditorPreferences::set_properties()
475+{
476+ // begin wxGlade: EditorPreferences::set_properties
477+ SetTitle(wxT("dialog_5"));
478+ // end wxGlade
479+}
480+
481+
482+void EditorPreferences::do_layout()
483+{
484+ // begin wxGlade: EditorPreferences::do_layout
485+ wxFlexGridSizer* sizer_45 = new wxFlexGridSizer(3, 1, 0, 0);
486+ wxBoxSizer* sizer_48 = new wxBoxSizer(wxHORIZONTAL);
487+ wxBoxSizer* sizer_47 = new wxBoxSizer(wxHORIZONTAL);
488+ wxFlexGridSizer* sizer_50 = new wxFlexGridSizer(3, 1, 0, 0);
489+ wxBoxSizer* sizer_51 = new wxBoxSizer(wxHORIZONTAL);
490+ wxBoxSizer* sizer_49 = new wxBoxSizer(wxVERTICAL);
491+ wxBoxSizer* sizer_46 = new wxBoxSizer(wxHORIZONTAL);
492+ sizer_46->Add(label_19, 0, 0, 0);
493+ sizer_46->Add(choice_9, 0, 0, 0);
494+ sizer_45->Add(sizer_46, 1, wxEXPAND, 0);
495+ sizer_49->Add(checkbox_27, 0, 0, 0);
496+ sizer_49->Add(checkbox_28, 0, 0, 0);
497+ sizer_49->Add(checkbox_31, 0, 0, 0);
498+ sizer_49->Add(checkbox_30, 0, 0, 0);
499+ sizer_49->Add(checkbox_32, 0, 0, 0);
500+ sizer_49->Add(checkbox_33, 0, 0, 0);
501+ sizer_49->Add(checkbox_34, 0, 0, 0);
502+ sizer_49->Add(checkbox_35, 0, 0, 0);
503+ sizer_49->Add(checkbox_36, 0, 0, 0);
504+ sizer_49->Add(checkbox_29, 0, 0, 0);
505+ sizer_47->Add(sizer_49, 1, wxEXPAND, 0);
506+ sizer_51->Add(label_20, 0, 0, 0);
507+ sizer_51->Add(choice_10, 0, 0, 0);
508+ sizer_50->Add(sizer_51, 1, wxEXPAND, 0);
509+ sizer_50->Add(checkbox_37, 0, 0, 0);
510+ sizer_50->Add(checkbox_38, 0, 0, 0);
511+ sizer_50->Add(button_15, 0, 0, 0);
512+ sizer_47->Add(sizer_50, 1, wxEXPAND, 0);
513+ sizer_45->Add(sizer_47, 1, wxEXPAND, 0);
514+ sizer_48->Add(button_13, 0, 0, 0);
515+ sizer_48->Add(button_14, 0, 0, 0);
516+ sizer_45->Add(sizer_48, 1, wxEXPAND, 0);
517+ SetSizer(sizer_45);
518+ sizer_45->Fit(this);
519+ Layout();
520+ // end wxGlade
521+}
522+
--- marathon/trunk/MapEditorWX/src/PolygonPropDialog.h (revision 332)
+++ marathon/trunk/MapEditorWX/src/PolygonPropDialog.h (revision 333)
@@ -1,7 +1,7 @@
11 #ifndef _POLYGON_PROP_DIALOG_
22 #define _POLYGON_PROP_DIALOG_
33
4-#include <wx/dialog.h>
4+#include "DlgCommon.h"
55
66 class PolygonPropDialog: public wxDialog{
77 public:
--- marathon/trunk/MapEditorWX/src/LinePropDialog.h (revision 332)
+++ marathon/trunk/MapEditorWX/src/LinePropDialog.h (revision 333)
@@ -1,7 +1,7 @@
11 #ifndef _LINE_PROP_DIALOG_
22 #define _LINE_PROP_DIALOG_
33
4-#include <wx/dialog.h>
4+#include "DlgCommon.h"
55
66 class LinePropDialog: public wxDialog{
77 public:
--- marathon/trunk/MapEditorWX/src/DlgCommon.h (nonexistent)
+++ marathon/trunk/MapEditorWX/src/DlgCommon.h (revision 333)
@@ -0,0 +1,19 @@
1+#ifndef _DLG_COMMON_
2+#define _DLG_COMMON_
3+
4+#include "map.h"
5+
6+#include <wx/dialog.h>
7+#include <wx/button.h>
8+#include <wx/checkbox.h>
9+#include <wx/stattext.h>
10+#include <wx/choice.h>
11+#include <wx/textctrl.h>
12+#include <wx/sizer.h>
13+#include <wx/image.h>
14+#include <wx/radiobut.h>
15+
16+#include "HPLLib/HPLEventManager.h"
17+#include <string>
18+
19+#endif
--- marathon/trunk/MapEditorWX/src/TextureDialog.h (revision 332)
+++ marathon/trunk/MapEditorWX/src/TextureDialog.h (revision 333)
@@ -1,7 +1,7 @@
11 #ifndef _TEXTURE_DIALOG_
22 #define _TEXTURE_DIALOG_
33
4-#include <wx/dialog.h>
4+#include "DlgCommon.h"
55
66 class TextureDialog: public wxDialog{
77 public:
--- marathon/trunk/MapEditorWX/src/HeightDialog.cpp (revision 332)
+++ marathon/trunk/MapEditorWX/src/HeightDialog.cpp (revision 333)
@@ -9,6 +9,8 @@
99 };
1010
1111 BEGIN_EVENT_TABLE(HeightDialog, wxDialog)
12+EVT_BUTTON(wxID_OK, HeightDialog::OnOk)
13+EVT_BUTTON(wxID_CANCEL, HeightDialog::OnCancel)
1214 END_EVENT_TABLE()
1315 HeightDialog::HeightDialog()
1416 {
@@ -21,16 +23,15 @@
2123 bool result = wxDialog::Create(parent, id, _T("Height"));
2224
2325 //create items
24- wxStaticText* label_9 = new wxStaticText(this, wxID_ANY, wxT("Floor"));
26+ label_9 = new wxStaticText(this, wxID_ANY, wxT("Floor"));
2527 text_ctrl_5 = new wxTextCtrl(this, wxID_ANY, wxEmptyString);
2628 slider_2 = new wxSlider(this, wxID_ANY, 0, 0, 10, wxDefaultPosition, wxDefaultSize, wxSL_VERTICAL);
2729 slider_3 = new wxSlider(this, wxID_ANY, 0, 0, 10, wxDefaultPosition, wxDefaultSize, wxSL_VERTICAL);
28- wxStaticText* label_10 = new wxStaticText(this, wxID_ANY, wxT("Ceiling"));
30+ label_10 = new wxStaticText(this, wxID_ANY, wxT("Ceiling"));
2931 text_ctrl_6 = new wxTextCtrl(this, wxID_ANY, wxEmptyString);
3032 checkbox_11 = new wxCheckBox(this, wxID_ANY, wxT("Draw hidden lines"));
3133
3234 //set properties
33- SetTitle(wxT("Height"));
3435 text_ctrl_5->SetMinSize(wxSize(50, -1));
3536 slider_2->SetMinSize(wxSize(-1, 200));
3637 slider_3->SetMinSize(wxSize(-1, 200));
--- marathon/trunk/MapEditorWX/src/PolygonNumDialog.h (revision 332)
+++ marathon/trunk/MapEditorWX/src/PolygonNumDialog.h (revision 333)
@@ -1,7 +1,7 @@
11 #ifndef _POLYGON_NUM_DIALOG_
22 #define _POLYGON_NUM_DIALOG_
33
4-#include <wx/dialog.h>
4+#include "DlgCommon.h"
55
66 class PolygonNumDialog: public wxDialog{
77 public:
--- marathon/trunk/MapEditorWX/src/ObjectPropDialog.h (revision 332)
+++ marathon/trunk/MapEditorWX/src/ObjectPropDialog.h (revision 333)
@@ -1,7 +1,8 @@
11 #ifndef _OBJECT_PROP_DIALOG_
22 #define _OBJECT_PROP_DIALOG_
3-#include <wx/dialog.h>
43
4+#include "DlgCommon.h"
5+
56 class ObjectPropDialog: public wxDialog{
67 public:
78 ObjectPropDialog();
--- marathon/trunk/MapEditorWX/src/SelectLevelDialog.h (revision 332)
+++ marathon/trunk/MapEditorWX/src/SelectLevelDialog.h (revision 333)
@@ -1,7 +1,7 @@
11 #ifndef _SELECT_LEVEL_DIALOG_
22 #define _SELECT_LEVEL_DIALOG_
33
4-#include <wx/dialog.h>
4+#include "DlgCommon.h"
55
66 class SelectLevelDialog: public wxDialog{
77 public:
旧リポジトリブラウザで表示