• R/O
  • SSH
  • HTTPS

marathon: コミット


コミットメタ情報

リビジョン353 (tree)
日時2007-06-29 19:51:10
作者hogepiyo

ログメッセージ

*** empty log message ***

変更サマリ

差分

--- marathon/trunk/MapEditorWX/src/LevelInfoDialog.h (revision 352)
+++ marathon/trunk/MapEditorWX/src/LevelInfoDialog.h (revision 353)
@@ -4,6 +4,34 @@
44 #include "DlgCommon.h"
55
66 class LevelInfoDialog: public wxDialog{
7+ wxStaticBox* sizer_59_staticbox;
8+ wxStaticBox* sizer_58_staticbox;
9+ wxStaticBox* sizer_60_staticbox;
10+ wxStaticText* label_65;
11+ wxTextCtrl* text_ctrl_44;
12+ wxStaticText* label_73;
13+ wxChoice* choice_28;
14+ wxStaticText* label_74;
15+ wxChoice* choice_29;
16+ wxCheckBox* checkbox_60;
17+ wxCheckBox* checkbox_62;
18+ wxCheckBox* checkbox_66;
19+ wxCheckBox* checkbox_63;
20+ wxCheckBox* checkbox_64;
21+ wxCheckBox* checkbox_65;
22+ wxCheckBox* checkbox_67;
23+ wxCheckBox* checkbox_61;
24+ wxCheckBox* checkbox_41;
25+ wxCheckBox* checkbox_42;
26+ wxCheckBox* checkbox_43;
27+ wxCheckBox* checkbox_44;
28+ wxCheckBox* checkbox_55;
29+ wxCheckBox* checkbox_56;
30+ wxCheckBox* checkbox_57;
31+ wxCheckBox* checkbox_58;
32+ wxCheckBox* checkbox_59;
33+ wxButton* button_28;
34+ wxButton* button_29;
735 public:
836 LevelInfoDialog();
937 bool Create(wxWindow* parent, wxWindowID id);
--- marathon/trunk/MapEditorWX/src/LightPaletteDialog.h (revision 352)
+++ marathon/trunk/MapEditorWX/src/LightPaletteDialog.h (revision 353)
@@ -4,6 +4,9 @@
44 #include "DlgCommon.h"
55
66 class LightPaletteDialog: public wxDialog{
7+ wxButton* button_31;
8+ wxButton* button_30;
9+ wxListCtrl* list_ctrl_5;
710 public:
811 LightPaletteDialog();
912 bool Create(wxWindow* parent, wxWindowID id);
@@ -10,6 +13,9 @@
1013 virtual ~LightPaletteDialog();
1114 //イベントテーブル作成<en>declare
1215 DECLARE_EVENT_TABLE()
16+ void OnAdd(wxCommandEvent &event); // wxGlade: <event_handler>
17+ void OnDelete(wxCommandEvent &event); // wxGlade: <event_handler>
18+ void OnEdit(wxListEvent &event); // wxGlade: <event_handler>
1319 };
1420
1521 #endif
--- marathon/trunk/MapEditorWX/src/HeightPaletteDialog.h (revision 352)
+++ marathon/trunk/MapEditorWX/src/HeightPaletteDialog.h (revision 353)
@@ -4,6 +4,9 @@
44 #include "DlgCommon.h"
55
66 class HeightPaletteDialog: public wxDialog{
7+ wxButton* button_24;
8+ wxButton* button_25;
9+ wxListCtrl* list_ctrl_3;
710 public:
811 HeightPaletteDialog();
912 bool Create(wxWindow* parent, wxWindowID id);
@@ -10,6 +13,9 @@
1013 virtual ~HeightPaletteDialog();
1114 //イベントテーブル作成<en>declare
1215 DECLARE_EVENT_TABLE()
16+ void OnAdd(wxCommandEvent &event); // wxGlade: <event_handler>
17+ void OnDelete(wxCommandEvent &event); // wxGlade: <event_handler>
18+ void OnEdit(wxListEvent &event); // wxGlade: <event_handler>
1319 };
1420
1521 #endif
--- marathon/trunk/MapEditorWX/src/PolygonTypeDialog.h (revision 352)
+++ marathon/trunk/MapEditorWX/src/PolygonTypeDialog.h (revision 353)
@@ -4,6 +4,7 @@
44 #include "DlgCommon.h"
55
66 class PolygonTypeDialog: public wxDialog{
7+ wxListCtrl* list_ctrl_2;
78 public:
89 PolygonTypeDialog();
910 bool Create(wxWindow* parent, wxWindowID id);
@@ -10,6 +11,8 @@
1011 virtual ~PolygonTypeDialog();
1112 //イベントテーブル作成<en>declare
1213 DECLARE_EVENT_TABLE()
14+ void OnSel(wxListEvent &event); // wxGlade: <event_handler>
15+
1316 };
1417
1518 #endif
--- marathon/trunk/MapEditorWX/src/MediaPaletteDialog.h (revision 352)
+++ marathon/trunk/MapEditorWX/src/MediaPaletteDialog.h (revision 353)
@@ -4,6 +4,9 @@
44 #include "DlgCommon.h"
55
66 class MediaPaletteDialog: public wxDialog{
7+ wxButton* button_27;
8+ wxButton* button_26;
9+ wxListCtrl* list_ctrl_4;
710 public:
811 MediaPaletteDialog();
912 bool Create(wxWindow* parent, wxWindowID id);
@@ -10,6 +13,9 @@
1013 virtual ~MediaPaletteDialog();
1114 //イベントテーブル作成<en>declare
1215 DECLARE_EVENT_TABLE()
16+ void OnAdd(wxCommandEvent &event); // wxGlade: <event_handler>
17+ void OnDelete(wxCommandEvent &event); // wxGlade: <event_handler>
18+ void OnEdit(wxListEvent &event); // wxGlade: <event_handler>
1319 };
1420
1521 #endif
--- marathon/trunk/MapEditorWX/src/ObjectPropDialog.cpp (revision 352)
+++ marathon/trunk/MapEditorWX/src/ObjectPropDialog.cpp (revision 353)
@@ -1,6 +1,33 @@
11 #include "ObjectPropDialog.h"
22 #include "MapEditorWX.h"
3+enum{
4+ ID_TYPE,
5+ ID_INDEX,
6+ ID_HIDDEN,
7+ ID_CEILING,
8+ ID_SEE,
9+ ID_HEAR,
10+ ID_AERIAL,
11+ ID_NET,
12+ ID_LAUNCH,
13+ ID_X,
14+ ID_Y,
15+ ID_Z,
16+};
17+
318 BEGIN_EVENT_TABLE(ObjectPropDialog, wxDialog)
19+ EVT_CHOICE(ID_TYPE, ObjectPropDialog::OnTypeChoice)
20+ EVT_CHOICE(ID_INDEX, ObjectPropDialog::OnIndexChoice)
21+ EVT_CHECKBOX(ID_HIDDEN, ObjectPropDialog::OnHiddenCheck)
22+ EVT_CHECKBOX(ID_CEILING, ObjectPropDialog::OnCeilingCheck)
23+ EVT_CHECKBOX(ID_SEE, ObjectPropDialog::OnSeeCheck)
24+ EVT_CHECKBOX(ID_HEAR, ObjectPropDialog::OnHearCheck)
25+ EVT_CHECKBOX(ID_AERIAL, ObjectPropDialog::OnAerialCheck)
26+ EVT_CHECKBOX(ID_NET, ObjectPropDialog::OnNetCheck)
27+ EVT_CHOICE(ID_LAUNCH, ObjectPropDialog::OnLaunchChoice)
28+ EVT_TEXT(ID_X, ObjectPropDialog::OnXEdit)
29+ EVT_TEXT(ID_Y, ObjectPropDialog::OnYEdit)
30+ EVT_TEXT(ID_Z, ObjectPropDialog::OnZEdit)
431 END_EVENT_TABLE()
532 ObjectPropDialog::ObjectPropDialog()
633 {
@@ -11,7 +38,91 @@
1138 bool ObjectPropDialog::Create(wxWindow* parent, wxWindowID id)
1239 {
1340 bool result = wxDialog::Create(parent, id, _T("Object Properties"));
41+ label_45 = new wxStaticText(this, wxID_ANY, wxT("Object type"));
42+ text_ctrl_27 = new wxTextCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY);
43+ choice_21 = new wxChoice(this, wxID_ANY);
44+ label_56 = new wxStaticText(this, wxID_ANY, wxT("Object index"));
45+ text_ctrl_32 = new wxTextCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY);
46+ choice_22 = new wxChoice(this, wxID_ANY);
47+ checkbox_46 = new wxCheckBox(this, wxID_ANY, wxT("Hidden"));
48+ checkbox_47 = new wxCheckBox(this, wxID_ANY, wxT("Hung on ceiling"));
49+ checkbox_48 = new wxCheckBox(this, wxID_ANY, wxT("Can't seeing"));
50+ checkbox_49 = new wxCheckBox(this, wxID_ANY, wxT("Can't hearing"));
51+ checkbox_50 = new wxCheckBox(this, wxID_ANY, wxT("From aerial"));
52+ checkbox_51 = new wxCheckBox(this, wxID_ANY, wxT("Only network game"));
53+ label_59 = new wxStaticText(this, wxID_ANY, wxT("Polygon ID"));
54+ text_ctrl_37 = new wxTextCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY);
55+ label_58 = new wxStaticText(this, wxID_ANY, wxT("Facing/Direction"));
56+ text_ctrl_38 = new wxTextCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY);
57+ panel_16 = new wxPanel(this, wxID_ANY);
58+ label_60 = new wxStaticText(this, wxID_ANY, wxT("Launch by"));
59+ choice_23 = new wxChoice(this, wxID_ANY);
60+ panel_17 = new wxPanel(this, wxID_ANY);
61+ label_61 = new wxStaticText(this, wxID_ANY, wxT("Location x"));
62+ text_ctrl_39 = new wxTextCtrl(this, wxID_ANY, wxEmptyString);
63+ label_63 = new wxStaticText(this, wxID_ANY, wxT("y"));
64+ text_ctrl_41 = new wxTextCtrl(this, wxID_ANY, wxEmptyString);
65+ label_62 = new wxStaticText(this, wxID_ANY, wxT(" z"));
66+ text_ctrl_40 = new wxTextCtrl(this, wxID_ANY, wxEmptyString);
67+ panel_18 = new wxPanel(this, wxID_ANY);
1468
69+ text_ctrl_27->SetMinSize(wxSize(20, -1));
70+ text_ctrl_32->SetMinSize(wxSize(20, -1));
71+ panel_16->SetMinSize(wxSize(120, 120));
72+ choice_23->SetMinSize(wxSize(90, 22));
73+ text_ctrl_39->SetMinSize(wxSize(50, -1));
74+ text_ctrl_41->SetMinSize(wxSize(50, -1));
75+ text_ctrl_40->SetMinSize(wxSize(50, -1));
76+
77+ wxFlexGridSizer* grid_sizer_15 = new wxFlexGridSizer(4, 1, 0, 0);
78+ wxFlexGridSizer* grid_sizer_20 = new wxFlexGridSizer(3, 3, 0, 0);
79+ wxFlexGridSizer* grid_sizer_24 = new wxFlexGridSizer(1, 2, 0, 0);
80+ wxFlexGridSizer* grid_sizer_18 = new wxFlexGridSizer(1, 2, 0, 0);
81+ wxFlexGridSizer* grid_sizer_19 = new wxFlexGridSizer(2, 1, 0, 0);
82+ wxFlexGridSizer* grid_sizer_21 = new wxFlexGridSizer(1, 2, 0, 0);
83+ wxFlexGridSizer* grid_sizer_23 = new wxFlexGridSizer(2, 1, 0, 0);
84+ wxFlexGridSizer* grid_sizer_22 = new wxFlexGridSizer(6, 1, 0, 0);
85+ wxFlexGridSizer* grid_sizer_16 = new wxFlexGridSizer(2, 3, 0, 0);
86+ grid_sizer_16->Add(label_45, 0, 0, 0);
87+ grid_sizer_16->Add(text_ctrl_27, 0, 0, 0);
88+ grid_sizer_16->Add(choice_21, 0, 0, 0);
89+ grid_sizer_16->Add(label_56, 0, 0, 0);
90+ grid_sizer_16->Add(text_ctrl_32, 0, 0, 0);
91+ grid_sizer_16->Add(choice_22, 0, 0, 0);
92+ grid_sizer_15->Add(grid_sizer_16, 1, wxEXPAND, 0);
93+ grid_sizer_22->Add(checkbox_46, 0, 0, 0);
94+ grid_sizer_22->Add(checkbox_47, 0, 0, 0);
95+ grid_sizer_22->Add(checkbox_48, 0, 0, 0);
96+ grid_sizer_22->Add(checkbox_49, 0, 0, 0);
97+ grid_sizer_22->Add(checkbox_50, 0, 0, 0);
98+ grid_sizer_22->Add(checkbox_51, 0, 0, 0);
99+ grid_sizer_21->Add(grid_sizer_22, 1, wxEXPAND, 0);
100+ grid_sizer_23->Add(label_59, 0, 0, 0);
101+ grid_sizer_23->Add(text_ctrl_37, 0, 0, 0);
102+ grid_sizer_21->Add(grid_sizer_23, 1, wxEXPAND, 0);
103+ grid_sizer_15->Add(grid_sizer_21, 1, wxEXPAND, 0);
104+ grid_sizer_19->Add(label_58, 0, 0, 0);
105+ grid_sizer_19->Add(text_ctrl_38, 0, 0, 0);
106+ grid_sizer_18->Add(grid_sizer_19, 1, wxEXPAND, 0);
107+ grid_sizer_18->Add(panel_16, 1, 0, 0);
108+ grid_sizer_15->Add(grid_sizer_18, 1, wxEXPAND, 0);
109+ grid_sizer_20->Add(label_60, 0, 0, 0);
110+ grid_sizer_20->Add(choice_23, 0, 0, 0);
111+ grid_sizer_20->Add(panel_17, 1, wxEXPAND, 0);
112+ grid_sizer_20->Add(label_61, 0, 0, 0);
113+ grid_sizer_20->Add(text_ctrl_39, 0, 0, 0);
114+ grid_sizer_24->Add(label_63, 0, 0, 0);
115+ grid_sizer_24->Add(text_ctrl_41, 0, 0, 0);
116+ grid_sizer_20->Add(grid_sizer_24, 1, wxEXPAND, 0);
117+ grid_sizer_20->Add(label_62, 0, 0, 0);
118+ grid_sizer_20->Add(text_ctrl_40, 0, 0, 0);
119+ grid_sizer_20->Add(panel_18, 1, wxEXPAND, 0);
120+ grid_sizer_15->Add(grid_sizer_20, 1, wxEXPAND, 0);
121+ SetSizer(grid_sizer_15);
122+ grid_sizer_15->Fit(this);
123+ Layout();
124+
125+ this->objIndex = NONE;
15126 return result;
16127 }
17128 void ObjectPropDialog::setObjIndex(int index)
@@ -26,3 +137,85 @@
26137 void ObjectPropDialog::setupDialog()
27138 {
28139 }
140+void ObjectPropDialog::OnTypeChoice(wxCommandEvent &event)
141+{
142+ event.Skip();
143+ std::cout<<"Event handler (ObjectPropDialog::OnTypeChoice) not implemented yet"<<std::endl; //notify the user that he hasn't implemented the event handler yet
144+}
145+
146+
147+void ObjectPropDialog::OnIndexChoice(wxCommandEvent &event)
148+{
149+ event.Skip();
150+ std::cout<<"Event handler (ObjectPropDialog::OnIndexChoice) not implemented yet"<<std::endl; //notify the user that he hasn't implemented the event handler yet
151+}
152+
153+
154+void ObjectPropDialog::OnHiddenCheck(wxCommandEvent &event)
155+{
156+ event.Skip();
157+ std::cout<<"Event handler (ObjectPropDialog::OnHiddenCheck) not implemented yet"<<std::endl; //notify the user that he hasn't implemented the event handler yet
158+}
159+
160+
161+void ObjectPropDialog::OnCeilingCheck(wxCommandEvent &event)
162+{
163+ event.Skip();
164+ std::cout<<"Event handler (ObjectPropDialog::OnCeilingCheck) not implemented yet"<<std::endl; //notify the user that he hasn't implemented the event handler yet
165+}
166+
167+
168+void ObjectPropDialog::OnSeeCheck(wxCommandEvent &event)
169+{
170+ event.Skip();
171+ std::cout<<"Event handler (ObjectPropDialog::OnSeeCheck) not implemented yet"<<std::endl; //notify the user that he hasn't implemented the event handler yet
172+}
173+
174+
175+void ObjectPropDialog::OnHearCheck(wxCommandEvent &event)
176+{
177+ event.Skip();
178+ std::cout<<"Event handler (ObjectPropDialog::OnHearCheck) not implemented yet"<<std::endl; //notify the user that he hasn't implemented the event handler yet
179+}
180+
181+
182+void ObjectPropDialog::OnAerialCheck(wxCommandEvent &event)
183+{
184+ event.Skip();
185+ std::cout<<"Event handler (ObjectPropDialog::OnAerialCheck) not implemented yet"<<std::endl; //notify the user that he hasn't implemented the event handler yet
186+}
187+
188+
189+void ObjectPropDialog::OnNetCheck(wxCommandEvent &event)
190+{
191+ event.Skip();
192+ std::cout<<"Event handler (ObjectPropDialog::OnNetCheck) not implemented yet"<<std::endl; //notify the user that he hasn't implemented the event handler yet
193+}
194+
195+
196+void ObjectPropDialog::OnLaunchChoice(wxCommandEvent &event)
197+{
198+ event.Skip();
199+ std::cout<<"Event handler (ObjectPropDialog::OnLaunchChoice) not implemented yet"<<std::endl; //notify the user that he hasn't implemented the event handler yet
200+}
201+
202+
203+void ObjectPropDialog::OnXEdit(wxCommandEvent &event)
204+{
205+ event.Skip();
206+ std::cout<<"Event handler (ObjectPropDialog::OnXEdit) not implemented yet"<<std::endl; //notify the user that he hasn't implemented the event handler yet
207+}
208+
209+
210+void ObjectPropDialog::OnYEdit(wxCommandEvent &event)
211+{
212+ event.Skip();
213+ std::cout<<"Event handler (ObjectPropDialog::OnYEdit) not implemented yet"<<std::endl; //notify the user that he hasn't implemented the event handler yet
214+}
215+
216+
217+void ObjectPropDialog::OnZEdit(wxCommandEvent &event)
218+{
219+ event.Skip();
220+ std::cout<<"Event handler (ObjectPropDialog::OnZEdit) not implemented yet"<<std::endl; //notify the user that he hasn't implemented the event handler yet
221+}
--- marathon/trunk/MapEditorWX/src/LevelInfoDialog.cpp (revision 352)
+++ marathon/trunk/MapEditorWX/src/LevelInfoDialog.cpp (revision 353)
@@ -11,6 +11,84 @@
1111 bool LevelInfoDialog::Create(wxWindow* parent, wxWindowID id)
1212 {
1313 bool result = wxDialog::Create(parent, id, _T("Level Information"));
14+ sizer_58_staticbox = new wxStaticBox(this, -1, wxT("Env Type"));
15+ sizer_59_staticbox = new wxStaticBox(this, -1, wxT("Mission Type"));
16+ sizer_60_staticbox = new wxStaticBox(this, -1, wxT("Game Type"));
17+ label_65 = new wxStaticText(this, wxID_ANY, wxT("Level lavel"));
18+ text_ctrl_44 = new wxTextCtrl(this, wxID_ANY, wxEmptyString);
19+ label_73 = new wxStaticText(this, wxID_ANY, wxT("Environment"));
20+ choice_28 = new wxChoice(this, wxID_ANY);
21+ label_74 = new wxStaticText(this, wxID_ANY, wxT("Landscape"));
22+ choice_29 = new wxChoice(this, wxID_ANY);
23+ checkbox_60 = new wxCheckBox(this, wxID_ANY, wxT("Single Player"));
24+ checkbox_62 = new wxCheckBox(this, wxID_ANY, wxT("Cooperation (COOP)"));
25+ checkbox_66 = new wxCheckBox(this, wxID_ANY, wxT("Capture The Flags (CTF)"));
26+ checkbox_63 = new wxCheckBox(this, wxID_ANY, wxT("King Of The Hill (KOTH)"));
27+ checkbox_64 = new wxCheckBox(this, wxID_ANY, wxT("Kill Man With Ball (BALL)"));
28+ checkbox_65 = new wxCheckBox(this, wxID_ANY, wxT("Defense"));
29+ checkbox_67 = new wxCheckBox(this, wxID_ANY, wxT("Rugby"));
30+ checkbox_61 = new wxCheckBox(this, ID_TAG, wxT("Tag"));
31+ checkbox_41 = new wxCheckBox(this, wxID_ANY, wxT("Vacuum"));
32+ checkbox_42 = new wxCheckBox(this, wxID_ANY, wxT("Rebellion"));
33+ checkbox_43 = new wxCheckBox(this, wxID_ANY, wxT("LowGravity"));
34+ checkbox_44 = new wxCheckBox(this, wxID_ANY, wxT("Magnetic"));
35+ checkbox_55 = new wxCheckBox(this, wxID_ANY, wxT("Extermination"));
36+ checkbox_56 = new wxCheckBox(this, wxID_ANY, wxT("Exploration"));
37+ checkbox_57 = new wxCheckBox(this, wxID_ANY, wxT("Retrieval"));
38+ checkbox_58 = new wxCheckBox(this, wxID_ANY, wxT("Repair"));
39+ checkbox_59 = new wxCheckBox(this, wxID_ANY, wxT("Rescue"));
40+ button_28 = new wxButton(this, wxID_OK, wxEmptyString);
41+ button_29 = new wxButton(this, wxID_CANCEL, wxEmptyString);
1442
43+ text_ctrl_44->SetMinSize(wxSize(250, -1));
44+ wxFlexGridSizer* grid_sizer_32 = new wxFlexGridSizer(3, 1, 0, 0);
45+ wxFlexGridSizer* grid_sizer_35 = new wxFlexGridSizer(1, 2, 0, 0);
46+ wxFlexGridSizer* grid_sizer_34 = new wxFlexGridSizer(1, 2, 0, 0);
47+ wxFlexGridSizer* grid_sizer_36 = new wxFlexGridSizer(2, 1, 0, 0);
48+ wxStaticBoxSizer* sizer_59 = new wxStaticBoxSizer(sizer_59_staticbox, wxVERTICAL);
49+ wxStaticBoxSizer* sizer_58 = new wxStaticBoxSizer(sizer_58_staticbox, wxVERTICAL);
50+ wxFlexGridSizer* grid_sizer_37 = new wxFlexGridSizer(3, 1, 0, 0);
51+ wxStaticBoxSizer* sizer_60 = new wxStaticBoxSizer(sizer_60_staticbox, wxVERTICAL);
52+ wxFlexGridSizer* grid_sizer_39 = new wxFlexGridSizer(1, 2, 0, 0);
53+ wxFlexGridSizer* grid_sizer_38 = new wxFlexGridSizer(1, 2, 0, 0);
54+ wxFlexGridSizer* grid_sizer_33 = new wxFlexGridSizer(1, 2, 0, 0);
55+ grid_sizer_33->Add(label_65, 0, 0, 0);
56+ grid_sizer_33->Add(text_ctrl_44, 0, wxEXPAND, 0);
57+ grid_sizer_32->Add(grid_sizer_33, 1, wxEXPAND, 0);
58+ grid_sizer_38->Add(label_73, 0, 0, 0);
59+ grid_sizer_38->Add(choice_28, 0, 0, 0);
60+ grid_sizer_37->Add(grid_sizer_38, 1, wxEXPAND, 0);
61+ grid_sizer_39->Add(label_74, 0, 0, 0);
62+ grid_sizer_39->Add(choice_29, 0, 0, 0);
63+ grid_sizer_37->Add(grid_sizer_39, 1, wxEXPAND, 0);
64+ sizer_60->Add(checkbox_60, 0, 0, 0);
65+ sizer_60->Add(checkbox_62, 0, 0, 0);
66+ sizer_60->Add(checkbox_66, 0, 0, 0);
67+ sizer_60->Add(checkbox_63, 0, 0, 0);
68+ sizer_60->Add(checkbox_64, 0, 0, 0);
69+ sizer_60->Add(checkbox_65, 0, 0, 0);
70+ sizer_60->Add(checkbox_67, 0, 0, 0);
71+ sizer_60->Add(checkbox_61, 0, 0, 0);
72+ grid_sizer_37->Add(sizer_60, 1, wxEXPAND, 0);
73+ grid_sizer_34->Add(grid_sizer_37, 1, wxEXPAND, 0);
74+ sizer_58->Add(checkbox_41, 0, 0, 0);
75+ sizer_58->Add(checkbox_42, 0, 0, 0);
76+ sizer_58->Add(checkbox_43, 0, 0, 0);
77+ sizer_58->Add(checkbox_44, 0, 0, 0);
78+ grid_sizer_36->Add(sizer_58, 1, wxEXPAND, 0);
79+ sizer_59->Add(checkbox_55, 0, 0, 0);
80+ sizer_59->Add(checkbox_56, 0, 0, 0);
81+ sizer_59->Add(checkbox_57, 0, 0, 0);
82+ sizer_59->Add(checkbox_58, 0, 0, 0);
83+ sizer_59->Add(checkbox_59, 0, 0, 0);
84+ grid_sizer_36->Add(sizer_59, 1, wxEXPAND, 0);
85+ grid_sizer_34->Add(grid_sizer_36, 1, wxEXPAND, 0);
86+ grid_sizer_32->Add(grid_sizer_34, 1, wxEXPAND, 0);
87+ grid_sizer_35->Add(button_28, 0, 0, 0);
88+ grid_sizer_35->Add(button_29, 0, 0, 0);
89+ grid_sizer_32->Add(grid_sizer_35, 1, wxEXPAND, 0);
90+ SetSizer(grid_sizer_32);
91+ grid_sizer_32->Fit(this);
92+ Layout();
1593 return result;
1694 }
--- marathon/trunk/MapEditorWX/src/LightPaletteDialog.cpp (revision 352)
+++ marathon/trunk/MapEditorWX/src/LightPaletteDialog.cpp (revision 353)
@@ -1,6 +1,9 @@
11 #include "LightPaletteDialog.h"
22 #include "MapEditorWX.h"
33 BEGIN_EVENT_TABLE(LightPaletteDialog, wxDialog)
4+ EVT_BUTTON(wxID_ADD, LightPaletteDialog::OnAdd)
5+ EVT_BUTTON(wxID_DELETE, LightPaletteDialog::OnDelete)
6+ EVT_LIST_END_LABEL_EDIT(ID_EDIT, LightPaletteDialog::OnEdit)
47 END_EVENT_TABLE()
58 LightPaletteDialog::LightPaletteDialog()
69 {
@@ -12,5 +15,21 @@
1215 {
1316 bool result = wxDialog::Create(parent, id, _T("Height Pallet"));
1417
18+ button_31 = new wxButton(this, wxID_ADD, wxEmptyString);
19+ button_30 = new wxButton(this, wxID_DELETE, wxEmptyString);
20+ list_ctrl_5 = new wxListCtrl(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_REPORT|wxSUNKEN_BORDER);
21+
22+ list_ctrl_5->SetMinSize(wxSize(150, 200));
23+
24+ wxFlexGridSizer* grid_sizer_40 = new wxFlexGridSizer(2, 1, 0, 0);
25+ wxFlexGridSizer* grid_sizer_41 = new wxFlexGridSizer(1, 2, 0, 0);
26+ grid_sizer_41->Add(button_31, 0, 0, 0);
27+ grid_sizer_41->Add(button_30, 0, 0, 0);
28+ grid_sizer_40->Add(grid_sizer_41, 1, wxEXPAND, 0);
29+ grid_sizer_40->Add(list_ctrl_5, 1, wxEXPAND, 0);
30+ SetSizer(grid_sizer_40);
31+ grid_sizer_40->Fit(this);
32+ Layout();
33+
1534 return result;
1635 }
--- marathon/trunk/MapEditorWX/src/HeightPaletteDialog.cpp (revision 352)
+++ marathon/trunk/MapEditorWX/src/HeightPaletteDialog.cpp (revision 353)
@@ -1,6 +1,13 @@
11 #include "HeightPaletteDialog.h"
22 #include "MapEditorWX.h"
3+enum{
4+ ID_EDIT,
5+};
6+
37 BEGIN_EVENT_TABLE(HeightPaletteDialog, wxDialog)
8+ EVT_BUTTON(wxID_ADD, HeightPaletteDialog::OnAdd)
9+ EVT_BUTTON(wxID_DELETE, HeightPaletteDialog::OnDelete)
10+ EVT_LIST_END_LABEL_EDIT(ID_EDIT, HeightPaletteDialog::OnEdit)
411 END_EVENT_TABLE()
512 HeightPaletteDialog::HeightPaletteDialog()
613 {
@@ -11,6 +18,39 @@
1118 bool HeightPaletteDialog::Create(wxWindow* parent, wxWindowID id)
1219 {
1320 bool result = wxDialog::Create(parent, id, _T("Height Pallet"));
21+ button_24 = new wxButton(this, wxID_ADD, wxEmptyString);
22+ button_25 = new wxButton(this, wxID_DELETE, wxEmptyString);
23+ list_ctrl_3 = new wxListCtrl(this, ID_EDIT, wxDefaultPosition, wxDefaultSize, wxLC_REPORT|wxLC_EDIT_LABELS|wxSUNKEN_BORDER);
1424
25+ list_ctrl_3->SetMinSize(wxSize(154, 200));
26+
27+ wxFlexGridSizer* grid_sizer_28 = new wxFlexGridSizer(2, 1, 0, 0);
28+ wxFlexGridSizer* grid_sizer_29 = new wxFlexGridSizer(1, 2, 0, 0);
29+ grid_sizer_29->Add(button_24, 0, 0, 0);
30+ grid_sizer_29->Add(button_25, 0, 0, 0);
31+ grid_sizer_28->Add(grid_sizer_29, 1, wxEXPAND, 0);
32+ grid_sizer_28->Add(list_ctrl_3, 1, wxEXPAND, 0);
33+ SetSizer(grid_sizer_28);
34+ grid_sizer_28->Fit(this);
35+ Layout();
1536 return result;
1637 }
38+void HeightPaletteDialog::OnAdd(wxCommandEvent &event)
39+{
40+ event.Skip();
41+ std::cout<<"Event handler (HeightPaletteDialog::OnAdd) not implemented yet"<<std::endl; //notify the user that he hasn't implemented the event handler yet
42+}
43+
44+
45+void HeightPaletteDialog::OnDelete(wxCommandEvent &event)
46+{
47+ event.Skip();
48+ std::cout<<"Event handler (HeightPaletteDialog::OnDelete) not implemented yet"<<std::endl; //notify the user that he hasn't implemented the event handler yet
49+}
50+
51+
52+void HeightPaletteDialog::OnEdit(wxListEvent &event)
53+{
54+ event.Skip();
55+ std::cout<<"Event handler (HeightPaletteDialog::OnEdit) not implemented yet"<<std::endl; //notify the user that he hasn't implemented the event handler yet
56+}
--- marathon/trunk/MapEditorWX/src/res/Dialogues.h (revision 352)
+++ marathon/trunk/MapEditorWX/src/res/Dialogues.h (revision 353)
@@ -1,4 +1,4 @@
1-// -*- C++ -*- generated by wxGlade 0.5 on Sun Jun 24 17:32:57 2007 from C:\(0saved\marathon\MapEditorWX\src\res\MapEditorWX.wxg
1+// -*- C++ -*- generated by wxGlade 0.5 on Fri Jun 29 15:39:41 2007 from C:\0save\marathon\MapEditorWX\src\res\MapEditorWX.wxg
22
33 #include <wx/wx.h>
44 #include <wx/image.h>
@@ -566,21 +566,21 @@
566566 }; // wxGlade: end class
567567
568568
569-class JumpLevelDialog: public wxDialog {
569+class SelectLevelDialog: public wxDialog {
570570 public:
571- // begin wxGlade: JumpLevelDialog::ids
571+ // begin wxGlade: SelectLevelDialog::ids
572572 // end wxGlade
573573
574- JumpLevelDialog(wxWindow* parent, int id, const wxString& title, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=wxDEFAULT_DIALOG_STYLE);
574+ SelectLevelDialog(wxWindow* parent, int id, const wxString& title, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=wxDEFAULT_DIALOG_STYLE);
575575
576576 private:
577- // begin wxGlade: JumpLevelDialog::methods
577+ // begin wxGlade: SelectLevelDialog::methods
578578 void set_properties();
579579 void do_layout();
580580 // end wxGlade
581581
582582 protected:
583- // begin wxGlade: JumpLevelDialog::attributes
583+ // begin wxGlade: SelectLevelDialog::attributes
584584 wxStaticText* label_57;
585585 wxListBox* list_box_4;
586586 wxButton* button_22;
@@ -680,4 +680,188 @@
680680 }; // wxGlade: end class
681681
682682
683+class LevelInfoDialog: public wxDialog {
684+public:
685+ // begin wxGlade: LevelInfoDialog::ids
686+ // end wxGlade
687+
688+ LevelInfoDialog(wxWindow* parent, int id, const wxString& title, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=wxDEFAULT_DIALOG_STYLE);
689+
690+private:
691+ // begin wxGlade: LevelInfoDialog::methods
692+ void set_properties();
693+ void do_layout();
694+ // end wxGlade
695+
696+protected:
697+ // begin wxGlade: LevelInfoDialog::attributes
698+ wxStaticBox* sizer_59_staticbox;
699+ wxStaticBox* sizer_58_staticbox;
700+ wxStaticBox* sizer_60_staticbox;
701+ wxStaticText* label_65;
702+ wxTextCtrl* text_ctrl_44;
703+ wxStaticText* label_73;
704+ wxChoice* choice_28;
705+ wxStaticText* label_74;
706+ wxChoice* choice_29;
707+ wxCheckBox* checkbox_60;
708+ wxCheckBox* checkbox_62;
709+ wxCheckBox* checkbox_66;
710+ wxCheckBox* checkbox_63;
711+ wxCheckBox* checkbox_64;
712+ wxCheckBox* checkbox_65;
713+ wxCheckBox* checkbox_67;
714+ wxCheckBox* checkbox_61;
715+ wxCheckBox* checkbox_41;
716+ wxCheckBox* checkbox_42;
717+ wxCheckBox* checkbox_43;
718+ wxCheckBox* checkbox_44;
719+ wxCheckBox* checkbox_55;
720+ wxCheckBox* checkbox_56;
721+ wxCheckBox* checkbox_57;
722+ wxCheckBox* checkbox_58;
723+ wxCheckBox* checkbox_59;
724+ wxButton* button_28;
725+ wxButton* button_29;
726+ // end wxGlade
727+}; // wxGlade: end class
728+
729+
730+class HeightPaletteDialog: public wxDialog {
731+public:
732+ // begin wxGlade: HeightPaletteDialog::ids
733+ // end wxGlade
734+
735+ HeightPaletteDialog(wxWindow* parent, int id, const wxString& title, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=wxDEFAULT_DIALOG_STYLE);
736+
737+private:
738+ // begin wxGlade: HeightPaletteDialog::methods
739+ void set_properties();
740+ void do_layout();
741+ // end wxGlade
742+
743+protected:
744+ // begin wxGlade: HeightPaletteDialog::attributes
745+ wxButton* button_24;
746+ wxButton* button_25;
747+ wxListCtrl* list_ctrl_3;
748+ // end wxGlade
749+
750+ DECLARE_EVENT_TABLE();
751+
752+public:
753+ void OnAdd(wxCommandEvent &event); // wxGlade: <event_handler>
754+ void OnDelete(wxCommandEvent &event); // wxGlade: <event_handler>
755+ void OnEdit(wxListEvent &event); // wxGlade: <event_handler>
756+}; // wxGlade: end class
757+
758+
759+class MediaPaletteDialog: public wxDialog {
760+public:
761+ // begin wxGlade: MediaPaletteDialog::ids
762+ // end wxGlade
763+
764+ MediaPaletteDialog(wxWindow* parent, int id, const wxString& title, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=wxDEFAULT_DIALOG_STYLE);
765+
766+private:
767+ // begin wxGlade: MediaPaletteDialog::methods
768+ void set_properties();
769+ void do_layout();
770+ // end wxGlade
771+
772+protected:
773+ // begin wxGlade: MediaPaletteDialog::attributes
774+ wxButton* button_27;
775+ wxButton* button_26;
776+ wxListCtrl* list_ctrl_4;
777+ // end wxGlade
778+
779+ DECLARE_EVENT_TABLE();
780+
781+public:
782+ void OnAdd(wxCommandEvent &event); // wxGlade: <event_handler>
783+ void OnDelete(wxCommandEvent &event); // wxGlade: <event_handler>
784+ void OnEdit(wxListEvent &event); // wxGlade: <event_handler>
785+}; // wxGlade: end class
786+
787+
788+class SidePropDialog: public wxDialog {
789+public:
790+ // begin wxGlade: SidePropDialog::ids
791+ // end wxGlade
792+
793+ SidePropDialog(wxWindow* parent, int id, const wxString& title, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=wxDEFAULT_DIALOG_STYLE);
794+
795+private:
796+ // begin wxGlade: SidePropDialog::methods
797+ void set_properties();
798+ void do_layout();
799+ // end wxGlade
800+
801+protected:
802+ // begin wxGlade: SidePropDialog::attributes
803+ // end wxGlade
804+}; // wxGlade: end class
805+
806+
807+class VisualDialog: public wxDialog {
808+public:
809+ // begin wxGlade: VisualDialog::ids
810+ // end wxGlade
811+
812+ VisualDialog(wxWindow* parent, int id, const wxString& title, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=wxDEFAULT_DIALOG_STYLE);
813+
814+private:
815+ // begin wxGlade: VisualDialog::methods
816+ void set_properties();
817+ void do_layout();
818+ // end wxGlade
819+
820+protected:
821+ // begin wxGlade: VisualDialog::attributes
822+ // end wxGlade
823+}; // wxGlade: end class
824+
825+
826+class TextureDialog: public wxDialog {
827+public:
828+ // begin wxGlade: TextureDialog::ids
829+ // end wxGlade
830+
831+ TextureDialog(wxWindow* parent, int id, const wxString& title, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=wxDEFAULT_DIALOG_STYLE);
832+
833+private:
834+ // begin wxGlade: TextureDialog::methods
835+ void set_properties();
836+ void do_layout();
837+ // end wxGlade
838+
839+protected:
840+ // begin wxGlade: TextureDialog::attributes
841+ // end wxGlade
842+}; // wxGlade: end class
843+
844+
845+class LightPaletteDialog: public wxDialog {
846+public:
847+ // begin wxGlade: LightPaletteDialog::ids
848+ // end wxGlade
849+
850+ LightPaletteDialog(wxWindow* parent, int id, const wxString& title, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=wxDEFAULT_DIALOG_STYLE);
851+
852+private:
853+ // begin wxGlade: LightPaletteDialog::methods
854+ void set_properties();
855+ void do_layout();
856+ // end wxGlade
857+
858+protected:
859+ // begin wxGlade: LightPaletteDialog::attributes
860+ wxButton* button_31;
861+ wxButton* button_30;
862+ wxListCtrl* list_ctrl_5;
863+ // end wxGlade
864+}; // wxGlade: end class
865+
866+
683867 #endif // DIALOGUES_H
--- marathon/trunk/MapEditorWX/src/res/Dialogues.cpp (revision 352)
+++ marathon/trunk/MapEditorWX/src/res/Dialogues.cpp (revision 353)
@@ -1,4 +1,4 @@
1-// -*- C++ -*- generated by wxGlade 0.5 on Sun Jun 24 17:32:57 2007 from C:\(0saved\marathon\MapEditorWX\src\res\MapEditorWX.wxg
1+// -*- C++ -*- generated by wxGlade 0.5 on Fri Jun 29 15:39:41 2007 from C:\0save\marathon\MapEditorWX\src\res\MapEditorWX.wxg
22
33 #include "Dialogues.h"
44
@@ -480,7 +480,7 @@
480480 sizer_37->Add(sizer_38, 1, wxEXPAND, 0);
481481 sizer_39->Add(label_14, 0, 0, 0);
482482 sizer_39->Add(button_8, 0, 0, 0);
483- sizer_39->Add(panel_2, 1, 0, 0);
483+ sizer_39->Add(panel_2, 1, wxEXPAND, 0);
484484 sizer_37->Add(sizer_39, 1, wxEXPAND, 0);
485485 sizer_40->Add(label_16, 0, 0, 0);
486486 sizer_40->Add(button_9, 0, 0, 0);
@@ -1721,10 +1721,10 @@
17211721 }
17221722
17231723
1724-JumpLevelDialog::JumpLevelDialog(wxWindow* parent, int id, const wxString& title, const wxPoint& pos, const wxSize& size, long style):
1724+SelectLevelDialog::SelectLevelDialog(wxWindow* parent, int id, const wxString& title, const wxPoint& pos, const wxSize& size, long style):
17251725 wxDialog(parent, id, title, pos, size, wxDEFAULT_DIALOG_STYLE)
17261726 {
1727- // begin wxGlade: JumpLevelDialog::JumpLevelDialog
1727+ // begin wxGlade: SelectLevelDialog::SelectLevelDialog
17281728 label_57 = new wxStaticText(this, wxID_ANY, wxT("Select level"));
17291729 const wxString list_box_4_choices[] = {
17301730
@@ -1739,42 +1739,42 @@
17391739 }
17401740
17411741
1742-BEGIN_EVENT_TABLE(JumpLevelDialog, wxDialog)
1743- // begin wxGlade: JumpLevelDialog::event_table
1744- EVT_LISTBOX(wxID_ANY, JumpLevelDialog::OnList)
1745- EVT_BUTTON(wxID_OK, JumpLevelDialog::OnOk)
1746- EVT_BUTTON(wxID_CANCEL, JumpLevelDialog::OnCancel)
1742+BEGIN_EVENT_TABLE(SelectLevelDialog, wxDialog)
1743+ // begin wxGlade: SelectLevelDialog::event_table
1744+ EVT_LISTBOX(wxID_ANY, SelectLevelDialog::OnList)
1745+ EVT_BUTTON(wxID_OK, SelectLevelDialog::OnOk)
1746+ EVT_BUTTON(wxID_CANCEL, SelectLevelDialog::OnCancel)
17471747 // end wxGlade
17481748 END_EVENT_TABLE();
17491749
17501750
1751-void JumpLevelDialog::OnList(wxCommandEvent &event)
1751+void SelectLevelDialog::OnList(wxCommandEvent &event)
17521752 {
17531753 event.Skip();
1754- std::cout<<"Event handler (JumpLevelDialog::OnList) not implemented yet"<<std::endl; //notify the user that he hasn't implemented the event handler yet
1754+ std::cout<<"Event handler (SelectLevelDialog::OnList) not implemented yet"<<std::endl; //notify the user that he hasn't implemented the event handler yet
17551755 }
17561756
17571757
1758-void JumpLevelDialog::OnOk(wxCommandEvent &event)
1758+void SelectLevelDialog::OnOk(wxCommandEvent &event)
17591759 {
17601760 event.Skip();
1761- std::cout<<"Event handler (JumpLevelDialog::OnOk) not implemented yet"<<std::endl; //notify the user that he hasn't implemented the event handler yet
1761+ std::cout<<"Event handler (SelectLevelDialog::OnOk) not implemented yet"<<std::endl; //notify the user that he hasn't implemented the event handler yet
17621762 }
17631763
17641764
1765-void JumpLevelDialog::OnCancel(wxCommandEvent &event)
1765+void SelectLevelDialog::OnCancel(wxCommandEvent &event)
17661766 {
17671767 event.Skip();
1768- std::cout<<"Event handler (JumpLevelDialog::OnCancel) not implemented yet"<<std::endl; //notify the user that he hasn't implemented the event handler yet
1768+ std::cout<<"Event handler (SelectLevelDialog::OnCancel) not implemented yet"<<std::endl; //notify the user that he hasn't implemented the event handler yet
17691769 }
17701770
17711771
1772-// wxGlade: add JumpLevelDialog event handlers
1772+// wxGlade: add SelectLevelDialog event handlers
17731773
17741774
1775-void JumpLevelDialog::set_properties()
1775+void SelectLevelDialog::set_properties()
17761776 {
1777- // begin wxGlade: JumpLevelDialog::set_properties
1777+ // begin wxGlade: SelectLevelDialog::set_properties
17781778 SetTitle(wxT("dialog_12"));
17791779 list_box_4->SetMinSize(wxSize(320, 320));
17801780 // end wxGlade
@@ -1781,9 +1781,9 @@
17811781 }
17821782
17831783
1784-void JumpLevelDialog::do_layout()
1784+void SelectLevelDialog::do_layout()
17851785 {
1786- // begin wxGlade: JumpLevelDialog::do_layout
1786+ // begin wxGlade: SelectLevelDialog::do_layout
17871787 wxFlexGridSizer* grid_sizer_17 = new wxFlexGridSizer(3, 1, 0, 0);
17881788 wxFlexGridSizer* grid_sizer_25 = new wxFlexGridSizer(1, 2, 0, 0);
17891789 grid_sizer_17->Add(label_57, 0, 0, 0);
@@ -2042,6 +2042,7 @@
20422042 {
20432043 // begin wxGlade: PolygonTypeDialog::set_properties
20442044 SetTitle(wxT("dialog_14"));
2045+ list_ctrl_2->SetMinSize(wxSize(120,120));
20452046 // end wxGlade
20462047 }
20472048
@@ -2057,3 +2058,377 @@
20572058 // end wxGlade
20582059 }
20592060
2061+
2062+LevelInfoDialog::LevelInfoDialog(wxWindow* parent, int id, const wxString& title, const wxPoint& pos, const wxSize& size, long style):
2063+ wxDialog(parent, id, title, pos, size, wxDEFAULT_DIALOG_STYLE)
2064+{
2065+ // begin wxGlade: LevelInfoDialog::LevelInfoDialog
2066+ sizer_58_staticbox = new wxStaticBox(this, -1, wxT("Env Type"));
2067+ sizer_59_staticbox = new wxStaticBox(this, -1, wxT("Mission Type"));
2068+ sizer_60_staticbox = new wxStaticBox(this, -1, wxT("Game Type"));
2069+ label_65 = new wxStaticText(this, wxID_ANY, wxT("Level lavel"));
2070+ text_ctrl_44 = new wxTextCtrl(this, wxID_ANY, wxEmptyString);
2071+ label_73 = new wxStaticText(this, wxID_ANY, wxT("Environment"));
2072+ const wxString choice_28_choices[] = {
2073+
2074+ };
2075+ choice_28 = new wxChoice(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, choice_28_choices, 0);
2076+ label_74 = new wxStaticText(this, wxID_ANY, wxT("Landscape"));
2077+ const wxString choice_29_choices[] = {
2078+
2079+ };
2080+ choice_29 = new wxChoice(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, choice_29_choices, 0);
2081+ checkbox_60 = new wxCheckBox(this, wxID_ANY, wxT("Single Player"));
2082+ checkbox_62 = new wxCheckBox(this, wxID_ANY, wxT("Cooperation (COOP)"));
2083+ checkbox_66 = new wxCheckBox(this, wxID_ANY, wxT("Capture The Flags (CTF)"));
2084+ checkbox_63 = new wxCheckBox(this, wxID_ANY, wxT("King Of The Hill (KOTH)"));
2085+ checkbox_64 = new wxCheckBox(this, wxID_ANY, wxT("Kill Man With Ball (BALL)"));
2086+ checkbox_65 = new wxCheckBox(this, wxID_ANY, wxT("Defense"));
2087+ checkbox_67 = new wxCheckBox(this, wxID_ANY, wxT("Rugby"));
2088+ checkbox_61 = new wxCheckBox(this, ID_TAG, wxT("Tag"));
2089+ checkbox_41 = new wxCheckBox(this, wxID_ANY, wxT("Vacuum"));
2090+ checkbox_42 = new wxCheckBox(this, wxID_ANY, wxT("Rebellion"));
2091+ checkbox_43 = new wxCheckBox(this, wxID_ANY, wxT("LowGravity"));
2092+ checkbox_44 = new wxCheckBox(this, wxID_ANY, wxT("Magnetic"));
2093+ checkbox_55 = new wxCheckBox(this, wxID_ANY, wxT("Extermination"));
2094+ checkbox_56 = new wxCheckBox(this, wxID_ANY, wxT("Exploration"));
2095+ checkbox_57 = new wxCheckBox(this, wxID_ANY, wxT("Retrieval"));
2096+ checkbox_58 = new wxCheckBox(this, wxID_ANY, wxT("Repair"));
2097+ checkbox_59 = new wxCheckBox(this, wxID_ANY, wxT("Rescue"));
2098+ button_28 = new wxButton(this, wxID_OK, wxEmptyString);
2099+ button_29 = new wxButton(this, wxID_CANCEL, wxEmptyString);
2100+
2101+ set_properties();
2102+ do_layout();
2103+ // end wxGlade
2104+}
2105+
2106+
2107+void LevelInfoDialog::set_properties()
2108+{
2109+ // begin wxGlade: LevelInfoDialog::set_properties
2110+ SetTitle(wxT("dialog_15"));
2111+ text_ctrl_44->SetMinSize(wxSize(250, -1));
2112+ // end wxGlade
2113+}
2114+
2115+
2116+void LevelInfoDialog::do_layout()
2117+{
2118+ // begin wxGlade: LevelInfoDialog::do_layout
2119+ wxFlexGridSizer* grid_sizer_32 = new wxFlexGridSizer(3, 1, 0, 0);
2120+ wxFlexGridSizer* grid_sizer_35 = new wxFlexGridSizer(1, 2, 0, 0);
2121+ wxFlexGridSizer* grid_sizer_34 = new wxFlexGridSizer(1, 2, 0, 0);
2122+ wxFlexGridSizer* grid_sizer_36 = new wxFlexGridSizer(2, 1, 0, 0);
2123+ wxStaticBoxSizer* sizer_59 = new wxStaticBoxSizer(sizer_59_staticbox, wxVERTICAL);
2124+ wxStaticBoxSizer* sizer_58 = new wxStaticBoxSizer(sizer_58_staticbox, wxVERTICAL);
2125+ wxFlexGridSizer* grid_sizer_37 = new wxFlexGridSizer(3, 1, 0, 0);
2126+ wxStaticBoxSizer* sizer_60 = new wxStaticBoxSizer(sizer_60_staticbox, wxVERTICAL);
2127+ wxFlexGridSizer* grid_sizer_39 = new wxFlexGridSizer(1, 2, 0, 0);
2128+ wxFlexGridSizer* grid_sizer_38 = new wxFlexGridSizer(1, 2, 0, 0);
2129+ wxFlexGridSizer* grid_sizer_33 = new wxFlexGridSizer(1, 2, 0, 0);
2130+ grid_sizer_33->Add(label_65, 0, 0, 0);
2131+ grid_sizer_33->Add(text_ctrl_44, 0, wxEXPAND, 0);
2132+ grid_sizer_32->Add(grid_sizer_33, 1, wxEXPAND, 0);
2133+ grid_sizer_38->Add(label_73, 0, 0, 0);
2134+ grid_sizer_38->Add(choice_28, 0, 0, 0);
2135+ grid_sizer_37->Add(grid_sizer_38, 1, wxEXPAND, 0);
2136+ grid_sizer_39->Add(label_74, 0, 0, 0);
2137+ grid_sizer_39->Add(choice_29, 0, 0, 0);
2138+ grid_sizer_37->Add(grid_sizer_39, 1, wxEXPAND, 0);
2139+ sizer_60->Add(checkbox_60, 0, 0, 0);
2140+ sizer_60->Add(checkbox_62, 0, 0, 0);
2141+ sizer_60->Add(checkbox_66, 0, 0, 0);
2142+ sizer_60->Add(checkbox_63, 0, 0, 0);
2143+ sizer_60->Add(checkbox_64, 0, 0, 0);
2144+ sizer_60->Add(checkbox_65, 0, 0, 0);
2145+ sizer_60->Add(checkbox_67, 0, 0, 0);
2146+ sizer_60->Add(checkbox_61, 0, 0, 0);
2147+ grid_sizer_37->Add(sizer_60, 1, wxEXPAND, 0);
2148+ grid_sizer_34->Add(grid_sizer_37, 1, wxEXPAND, 0);
2149+ sizer_58->Add(checkbox_41, 0, 0, 0);
2150+ sizer_58->Add(checkbox_42, 0, 0, 0);
2151+ sizer_58->Add(checkbox_43, 0, 0, 0);
2152+ sizer_58->Add(checkbox_44, 0, 0, 0);
2153+ grid_sizer_36->Add(sizer_58, 1, wxEXPAND, 0);
2154+ sizer_59->Add(checkbox_55, 0, 0, 0);
2155+ sizer_59->Add(checkbox_56, 0, 0, 0);
2156+ sizer_59->Add(checkbox_57, 0, 0, 0);
2157+ sizer_59->Add(checkbox_58, 0, 0, 0);
2158+ sizer_59->Add(checkbox_59, 0, 0, 0);
2159+ grid_sizer_36->Add(sizer_59, 1, wxEXPAND, 0);
2160+ grid_sizer_34->Add(grid_sizer_36, 1, wxEXPAND, 0);
2161+ grid_sizer_32->Add(grid_sizer_34, 1, wxEXPAND, 0);
2162+ grid_sizer_35->Add(button_28, 0, 0, 0);
2163+ grid_sizer_35->Add(button_29, 0, 0, 0);
2164+ grid_sizer_32->Add(grid_sizer_35, 1, wxEXPAND, 0);
2165+ SetSizer(grid_sizer_32);
2166+ grid_sizer_32->Fit(this);
2167+ Layout();
2168+ // end wxGlade
2169+}
2170+
2171+
2172+HeightPaletteDialog::HeightPaletteDialog(wxWindow* parent, int id, const wxString& title, const wxPoint& pos, const wxSize& size, long style):
2173+ wxDialog(parent, id, title, pos, size, wxDEFAULT_DIALOG_STYLE)
2174+{
2175+ // begin wxGlade: HeightPaletteDialog::HeightPaletteDialog
2176+ button_24 = new wxButton(this, wxID_ADD, wxEmptyString);
2177+ button_25 = new wxButton(this, wxID_DELETE, wxEmptyString);
2178+ list_ctrl_3 = new wxListCtrl(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_REPORT|wxLC_EDIT_LABELS|wxSUNKEN_BORDER);
2179+
2180+ set_properties();
2181+ do_layout();
2182+ // end wxGlade
2183+}
2184+
2185+
2186+BEGIN_EVENT_TABLE(HeightPaletteDialog, wxDialog)
2187+ // begin wxGlade: HeightPaletteDialog::event_table
2188+ EVT_BUTTON(wxID_ANY, HeightPaletteDialog::OnAdd)
2189+ EVT_BUTTON(wxID_ANY, HeightPaletteDialog::OnDelete)
2190+ EVT_LIST_END_LABEL_EDIT(wxID_ANY, HeightPaletteDialog::OnEdit)
2191+ // end wxGlade
2192+END_EVENT_TABLE();
2193+
2194+
2195+void HeightPaletteDialog::OnAdd(wxCommandEvent &event)
2196+{
2197+ event.Skip();
2198+ std::cout<<"Event handler (HeightPaletteDialog::OnAdd) not implemented yet"<<std::endl; //notify the user that he hasn't implemented the event handler yet
2199+}
2200+
2201+
2202+void HeightPaletteDialog::OnDelete(wxCommandEvent &event)
2203+{
2204+ event.Skip();
2205+ std::cout<<"Event handler (HeightPaletteDialog::OnDelete) not implemented yet"<<std::endl; //notify the user that he hasn't implemented the event handler yet
2206+}
2207+
2208+
2209+void HeightPaletteDialog::OnEdit(wxListEvent &event)
2210+{
2211+ event.Skip();
2212+ std::cout<<"Event handler (HeightPaletteDialog::OnEdit) not implemented yet"<<std::endl; //notify the user that he hasn't implemented the event handler yet
2213+}
2214+
2215+
2216+// wxGlade: add HeightPaletteDialog event handlers
2217+
2218+
2219+void HeightPaletteDialog::set_properties()
2220+{
2221+ // begin wxGlade: HeightPaletteDialog::set_properties
2222+ SetTitle(wxT("dialog_16"));
2223+ list_ctrl_3->SetMinSize(wxSize(154, 200));
2224+ // end wxGlade
2225+}
2226+
2227+
2228+void HeightPaletteDialog::do_layout()
2229+{
2230+ // begin wxGlade: HeightPaletteDialog::do_layout
2231+ wxFlexGridSizer* grid_sizer_28 = new wxFlexGridSizer(2, 1, 0, 0);
2232+ wxFlexGridSizer* grid_sizer_29 = new wxFlexGridSizer(1, 2, 0, 0);
2233+ grid_sizer_29->Add(button_24, 0, 0, 0);
2234+ grid_sizer_29->Add(button_25, 0, 0, 0);
2235+ grid_sizer_28->Add(grid_sizer_29, 1, wxEXPAND, 0);
2236+ grid_sizer_28->Add(list_ctrl_3, 1, wxEXPAND, 0);
2237+ SetSizer(grid_sizer_28);
2238+ grid_sizer_28->Fit(this);
2239+ Layout();
2240+ // end wxGlade
2241+}
2242+
2243+
2244+MediaPaletteDialog::MediaPaletteDialog(wxWindow* parent, int id, const wxString& title, const wxPoint& pos, const wxSize& size, long style):
2245+ wxDialog(parent, id, title, pos, size, wxDEFAULT_DIALOG_STYLE)
2246+{
2247+ // begin wxGlade: MediaPaletteDialog::MediaPaletteDialog
2248+ button_27 = new wxButton(this, wxID_ADD, wxEmptyString);
2249+ button_26 = new wxButton(this, wxID_DELETE, wxEmptyString);
2250+ list_ctrl_4 = new wxListCtrl(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_REPORT|wxSUNKEN_BORDER);
2251+
2252+ set_properties();
2253+ do_layout();
2254+ // end wxGlade
2255+}
2256+
2257+
2258+BEGIN_EVENT_TABLE(MediaPaletteDialog, wxDialog)
2259+ // begin wxGlade: MediaPaletteDialog::event_table
2260+ EVT_BUTTON(wxID_ANY, MediaPaletteDialog::OnAdd)
2261+ EVT_BUTTON(wxID_ANY, MediaPaletteDialog::OnDelete)
2262+ EVT_LIST_END_LABEL_EDIT(wxID_ANY, MediaPaletteDialog::OnEdit)
2263+ // end wxGlade
2264+END_EVENT_TABLE();
2265+
2266+
2267+void MediaPaletteDialog::OnAdd(wxCommandEvent &event)
2268+{
2269+ event.Skip();
2270+ std::cout<<"Event handler (MediaPaletteDialog::OnAdd) not implemented yet"<<std::endl; //notify the user that he hasn't implemented the event handler yet
2271+}
2272+
2273+
2274+void MediaPaletteDialog::OnDelete(wxCommandEvent &event)
2275+{
2276+ event.Skip();
2277+ std::cout<<"Event handler (MediaPaletteDialog::OnDelete) not implemented yet"<<std::endl; //notify the user that he hasn't implemented the event handler yet
2278+}
2279+
2280+
2281+void MediaPaletteDialog::OnEdit(wxListEvent &event)
2282+{
2283+ event.Skip();
2284+ std::cout<<"Event handler (MediaPaletteDialog::OnEdit) not implemented yet"<<std::endl; //notify the user that he hasn't implemented the event handler yet
2285+}
2286+
2287+
2288+// wxGlade: add MediaPaletteDialog event handlers
2289+
2290+
2291+void MediaPaletteDialog::set_properties()
2292+{
2293+ // begin wxGlade: MediaPaletteDialog::set_properties
2294+ SetTitle(wxT("dialog_17"));
2295+ list_ctrl_4->SetMinSize(wxSize(154, 200));
2296+ // end wxGlade
2297+}
2298+
2299+
2300+void MediaPaletteDialog::do_layout()
2301+{
2302+ // begin wxGlade: MediaPaletteDialog::do_layout
2303+ wxFlexGridSizer* grid_sizer_30 = new wxFlexGridSizer(2, 1, 0, 0);
2304+ wxFlexGridSizer* grid_sizer_31 = new wxFlexGridSizer(1, 2, 0, 0);
2305+ grid_sizer_31->Add(button_27, 0, 0, 0);
2306+ grid_sizer_31->Add(button_26, 0, 0, 0);
2307+ grid_sizer_30->Add(grid_sizer_31, 1, wxEXPAND, 0);
2308+ grid_sizer_30->Add(list_ctrl_4, 1, wxEXPAND, 0);
2309+ SetSizer(grid_sizer_30);
2310+ grid_sizer_30->Fit(this);
2311+ Layout();
2312+ // end wxGlade
2313+}
2314+
2315+
2316+SidePropDialog::SidePropDialog(wxWindow* parent, int id, const wxString& title, const wxPoint& pos, const wxSize& size, long style):
2317+ wxDialog(parent, id, title, pos, size, wxDEFAULT_DIALOG_STYLE)
2318+{
2319+ // begin wxGlade: SidePropDialog::SidePropDialog
2320+
2321+ set_properties();
2322+ do_layout();
2323+ // end wxGlade
2324+}
2325+
2326+
2327+void SidePropDialog::set_properties()
2328+{
2329+ // begin wxGlade: SidePropDialog::set_properties
2330+ SetTitle(wxT("dialog_18"));
2331+ // end wxGlade
2332+}
2333+
2334+
2335+void SidePropDialog::do_layout()
2336+{
2337+ // begin wxGlade: SidePropDialog::do_layout
2338+ Layout();
2339+ // end wxGlade
2340+}
2341+
2342+
2343+VisualDialog::VisualDialog(wxWindow* parent, int id, const wxString& title, const wxPoint& pos, const wxSize& size, long style):
2344+ wxDialog(parent, id, title, pos, size, wxDEFAULT_DIALOG_STYLE)
2345+{
2346+ // begin wxGlade: VisualDialog::VisualDialog
2347+
2348+ set_properties();
2349+ do_layout();
2350+ // end wxGlade
2351+}
2352+
2353+
2354+void VisualDialog::set_properties()
2355+{
2356+ // begin wxGlade: VisualDialog::set_properties
2357+ SetTitle(wxT("dialog_19"));
2358+ // end wxGlade
2359+}
2360+
2361+
2362+void VisualDialog::do_layout()
2363+{
2364+ // begin wxGlade: VisualDialog::do_layout
2365+ Layout();
2366+ // end wxGlade
2367+}
2368+
2369+
2370+TextureDialog::TextureDialog(wxWindow* parent, int id, const wxString& title, const wxPoint& pos, const wxSize& size, long style):
2371+ wxDialog(parent, id, title, pos, size, wxDEFAULT_DIALOG_STYLE)
2372+{
2373+ // begin wxGlade: TextureDialog::TextureDialog
2374+
2375+ set_properties();
2376+ do_layout();
2377+ // end wxGlade
2378+}
2379+
2380+
2381+void TextureDialog::set_properties()
2382+{
2383+ // begin wxGlade: TextureDialog::set_properties
2384+ SetTitle(wxT("dialog_20"));
2385+ // end wxGlade
2386+}
2387+
2388+
2389+void TextureDialog::do_layout()
2390+{
2391+ // begin wxGlade: TextureDialog::do_layout
2392+ Layout();
2393+ // end wxGlade
2394+}
2395+
2396+
2397+LightPaletteDialog::LightPaletteDialog(wxWindow* parent, int id, const wxString& title, const wxPoint& pos, const wxSize& size, long style):
2398+ wxDialog(parent, id, title, pos, size, wxDEFAULT_DIALOG_STYLE)
2399+{
2400+ // begin wxGlade: LightPaletteDialog::LightPaletteDialog
2401+ button_31 = new wxButton(this, wxID_ADD, wxEmptyString);
2402+ button_30 = new wxButton(this, wxID_DELETE, wxEmptyString);
2403+ list_ctrl_5 = new wxListCtrl(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_REPORT|wxSUNKEN_BORDER);
2404+
2405+ set_properties();
2406+ do_layout();
2407+ // end wxGlade
2408+}
2409+
2410+
2411+void LightPaletteDialog::set_properties()
2412+{
2413+ // begin wxGlade: LightPaletteDialog::set_properties
2414+ SetTitle(wxT("dialog_21"));
2415+ list_ctrl_5->SetMinSize(wxSize(150, 200));
2416+ // end wxGlade
2417+}
2418+
2419+
2420+void LightPaletteDialog::do_layout()
2421+{
2422+ // begin wxGlade: LightPaletteDialog::do_layout
2423+ wxFlexGridSizer* grid_sizer_40 = new wxFlexGridSizer(2, 1, 0, 0);
2424+ wxFlexGridSizer* grid_sizer_41 = new wxFlexGridSizer(1, 2, 0, 0);
2425+ grid_sizer_41->Add(button_31, 0, 0, 0);
2426+ grid_sizer_41->Add(button_30, 0, 0, 0);
2427+ grid_sizer_40->Add(grid_sizer_41, 1, wxEXPAND, 0);
2428+ grid_sizer_40->Add(list_ctrl_5, 1, wxEXPAND, 0);
2429+ SetSizer(grid_sizer_40);
2430+ grid_sizer_40->Fit(this);
2431+ Layout();
2432+ // end wxGlade
2433+}
2434+
--- marathon/trunk/MapEditorWX/src/PolygonTypeDialog.cpp (revision 352)
+++ marathon/trunk/MapEditorWX/src/PolygonTypeDialog.cpp (revision 353)
@@ -1,6 +1,10 @@
11 #include "PolygonTypeDialog.h"
22 #include "MapEditorWX.h"
3+enum{
4+ ID_SEL
5+};
36 BEGIN_EVENT_TABLE(PolygonTypeDialog, wxDialog)
7+ EVT_LIST_ITEM_SELECTED(ID_SEL, PolygonTypeDialog::OnSel)
48 END_EVENT_TABLE()
59 PolygonTypeDialog::PolygonTypeDialog()
610 {
@@ -12,5 +16,18 @@
1216 {
1317 bool result = wxDialog::Create(parent, id, _T("Polygon Type"));
1418
19+ list_ctrl_2 = new wxListCtrl(this, ID_SEL, wxDefaultPosition, wxDefaultSize, wxLC_REPORT|wxSUNKEN_BORDER);
20+ list_ctrl_2->SetMinSize(wxSize(120,120));
21+
22+ wxBoxSizer* sizer_53 = new wxBoxSizer(wxHORIZONTAL);
23+ sizer_53->Add(list_ctrl_2, 1, wxEXPAND, 0);
24+ SetSizer(sizer_53);
25+ sizer_53->Fit(this);
26+ Layout();
1527 return result;
1628 }
29+void PolygonTypeDialog::OnSel(wxListEvent &event)
30+{
31+ event.Skip();
32+ std::cout<<"Event handler (PolygonTypeDialog::OnSel) not implemented yet"<<std::endl; //notify the user that he hasn't implemented the event handler yet
33+}
--- marathon/trunk/MapEditorWX/src/MediaPaletteDialog.cpp (revision 352)
+++ marathon/trunk/MapEditorWX/src/MediaPaletteDialog.cpp (revision 353)
@@ -1,6 +1,13 @@
11 #include "MediaPaletteDialog.h"
22 #include "MapEditorWX.h"
3+enum{
4+ ID_EDIT,
5+};
6+
37 BEGIN_EVENT_TABLE(MediaPaletteDialog, wxDialog)
8+ EVT_BUTTON(wxID_ADD, MediaPaletteDialog::OnAdd)
9+ EVT_BUTTON(wxID_DELETE, MediaPaletteDialog::OnDelete)
10+ EVT_LIST_END_LABEL_EDIT(ID_EDIT, MediaPaletteDialog::OnEdit)
411 END_EVENT_TABLE()
512 MediaPaletteDialog::MediaPaletteDialog()
613 {
@@ -12,5 +19,39 @@
1219 {
1320 bool result = wxDialog::Create(parent, id, _T("Height Pallet"));
1421
22+ button_27 = new wxButton(this, wxID_ADD, wxEmptyString);
23+ button_26 = new wxButton(this, wxID_DELETE, wxEmptyString);
24+ list_ctrl_4 = new wxListCtrl(this, ID_EDIT, wxDefaultPosition, wxDefaultSize, wxLC_REPORT|wxSUNKEN_BORDER);
25+
26+ list_ctrl_4->SetMinSize(wxSize(154, 200));
27+
28+ wxFlexGridSizer* grid_sizer_30 = new wxFlexGridSizer(2, 1, 0, 0);
29+ wxFlexGridSizer* grid_sizer_31 = new wxFlexGridSizer(1, 2, 0, 0);
30+ grid_sizer_31->Add(button_27, 0, 0, 0);
31+ grid_sizer_31->Add(button_26, 0, 0, 0);
32+ grid_sizer_30->Add(grid_sizer_31, 1, wxEXPAND, 0);
33+ grid_sizer_30->Add(list_ctrl_4, 1, wxEXPAND, 0);
34+ SetSizer(grid_sizer_30);
35+ grid_sizer_30->Fit(this);
36+ Layout();
1537 return result;
1638 }
39+void MediaPaletteDialog::OnAdd(wxCommandEvent &event)
40+{
41+ event.Skip();
42+ std::cout<<"Event handler (MediaPaletteDialog::OnAdd) not implemented yet"<<std::endl; //notify the user that he hasn't implemented the event handler yet
43+}
44+
45+
46+void MediaPaletteDialog::OnDelete(wxCommandEvent &event)
47+{
48+ event.Skip();
49+ std::cout<<"Event handler (MediaPaletteDialog::OnDelete) not implemented yet"<<std::endl; //notify the user that he hasn't implemented the event handler yet
50+}
51+
52+
53+void MediaPaletteDialog::OnEdit(wxListEvent &event)
54+{
55+ event.Skip();
56+ std::cout<<"Event handler (MediaPaletteDialog::OnEdit) not implemented yet"<<std::endl; //notify the user that he hasn't implemented the event handler yet
57+}
--- marathon/trunk/MapEditorWX/src/ObjectPropDialog.h (revision 352)
+++ marathon/trunk/MapEditorWX/src/ObjectPropDialog.h (revision 353)
@@ -4,6 +4,33 @@
44 #include "DlgCommon.h"
55
66 class ObjectPropDialog: public wxDialog{
7+ wxStaticText* label_45;
8+ wxTextCtrl* text_ctrl_27;
9+ wxChoice* choice_21;
10+ wxStaticText* label_56;
11+ wxTextCtrl* text_ctrl_32;
12+ wxChoice* choice_22;
13+ wxCheckBox* checkbox_46;
14+ wxCheckBox* checkbox_47;
15+ wxCheckBox* checkbox_48;
16+ wxCheckBox* checkbox_49;
17+ wxCheckBox* checkbox_50;
18+ wxCheckBox* checkbox_51;
19+ wxStaticText* label_59;
20+ wxTextCtrl* text_ctrl_37;
21+ wxStaticText* label_58;
22+ wxTextCtrl* text_ctrl_38;
23+ wxPanel* panel_16;
24+ wxStaticText* label_60;
25+ wxChoice* choice_23;
26+ wxPanel* panel_17;
27+ wxStaticText* label_61;
28+ wxTextCtrl* text_ctrl_39;
29+ wxStaticText* label_63;
30+ wxTextCtrl* text_ctrl_41;
31+ wxStaticText* label_62;
32+ wxTextCtrl* text_ctrl_40;
33+ wxPanel* panel_18;
734 int objIndex;
835 public:
936 ObjectPropDialog();
@@ -16,6 +43,18 @@
1643 void setupDialog();
1744 //イベントテーブル作成<en>declare
1845 DECLARE_EVENT_TABLE()
46+ void OnTypeChoice(wxCommandEvent &event); // wxGlade: <event_handler>
47+ void OnIndexChoice(wxCommandEvent &event); // wxGlade: <event_handler>
48+ void OnHiddenCheck(wxCommandEvent &event); // wxGlade: <event_handler>
49+ void OnCeilingCheck(wxCommandEvent &event); // wxGlade: <event_handler>
50+ void OnSeeCheck(wxCommandEvent &event); // wxGlade: <event_handler>
51+ void OnHearCheck(wxCommandEvent &event); // wxGlade: <event_handler>
52+ void OnAerialCheck(wxCommandEvent &event); // wxGlade: <event_handler>
53+ void OnNetCheck(wxCommandEvent &event); // wxGlade: <event_handler>
54+ void OnLaunchChoice(wxCommandEvent &event); // wxGlade: <event_handler>
55+ void OnXEdit(wxCommandEvent &event); // wxGlade: <event_handler>
56+ void OnYEdit(wxCommandEvent &event); // wxGlade: <event_handler>
57+ void OnZEdit(wxCommandEvent &event); // wxGlade: <event_handler>
1958 };
2059
2160 #endif
--- marathon/trunk/MapEditorWX/WXTODOリスト.txt (revision 352)
+++ marathon/trunk/MapEditorWX/WXTODOリスト.txt (revision 353)
@@ -36,16 +36,16 @@
3636 ColorCustomize :???o??
3737 EditPreferences :???o??
3838 Height :???o??
39-HeightPallet :
40-LevelInfo :
39+HeightPallet :wx
40+LevelInfo :?z?u
4141 LineProp :?z?u
42-ObjectProp :wx
42+ObjectProp :?z?u
4343 Placement :???o??
4444 Platform :?z?u
4545 PointProp :?z?u
4646 PolygonNum :???o??
4747 PolygonProp :?z?u
48-PolygonType :wx
48+PolygonType :?z?u
4949 SelectLevel :?z?u
5050 SideProp :
5151 Terminal :???o??
@@ -53,10 +53,11 @@
5353 Tool :?z?u
5454 Visual :
5555
56-JumpLevel :wx
57-MediaPalette :
58-LightPalette :
59-SoundPalette :
56+XXXX JumpLevel
57+SelectLevel :?z?u
58+MediaPalette :?z?u
59+LightPalette :?z?u
60+SoundPalette :wx
6061
6162 ???C?x???g?????̋L?q?͏I????Ă??邩?H?̃??X?g
6263 ?ETODO????Ȃ炻?̓??e??????
@@ -156,6 +157,9 @@
156157 TODO VisualMode oh visual mode!
157158 TODO Polygon tool
158159 TODO ?͈͊O?̂??̂??I???ł???o?O
159-TODO ?X???C?_?[?𓮂?????0?ɌŒ肳??Ă??܂?
160+?ς? TODO ?X???C?_?[?𓮂?????0?ɌŒ肳??Ă??܂?
161+ ??ev.?ł͂Ȃ??A???ڃI?u?W?F?N?g????l???Ƃ??OK?BGetInt()??0???Ԃ?
160162 TODO ??ԏオMin?ɂȂ??Ă?
161-TODO ObjectPlacement
\ No newline at end of file
163+TODO ObjectPlacement
164+?ς? TODO MediaList???ď?????Ԃœ????Ă???̂Ȃ́H
165+ ?????Ԃ?????ĂȂ??H
旧リポジトリブラウザで表示