Skip to content

Commit 451d116

Browse files
intorrintorr
committed
Try to fix xrWeatherEditor forms load/save error in Visual Studio.
1 parent f97a69d commit 451d116

File tree

6 files changed

+165
-316
lines changed

6 files changed

+165
-316
lines changed

‎src/editors/xrWeatherEditor/window_ide.h‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,7 @@ public ref class window_ide : public System::Windows::Forms::Form
7070
}
7171

7272
protected:
73-
private:
74-
WeifenLuo::WinFormsUI::Docking::DockPanel ^ EditorDock;
73+
private: WeifenLuo::WinFormsUI::Docking::DockPanel ^ EditorDock;
7574

7675
private:
7776
/// <summary>
@@ -153,11 +152,10 @@ public ref class window_ide : public System::Windows::Forms::Form
153152
private:
154153
WeifenLuo::WinFormsUI::Docking::IDockContent ^ reload_content(System::String ^ persist_string);
155154

156-
private:
157-
System::Void window_ide_SizeChanged(System::Object ^ sender, System::EventArgs ^ e);
158-
System::Void window_ide_LocationChanged(System::Object ^ sender, System::EventArgs ^ e);
159-
System::Void window_ide_FormClosing(System::Object ^ sender, System::Windows::Forms::FormClosingEventArgs ^ e);
160-
System::Void window_ide_Activated(System::Object ^ sender, System::EventArgs ^ e);
161-
System::Void window_ide_Deactivate(System::Object ^ sender, System::EventArgs ^ e);
155+
private: System::Void window_ide_SizeChanged(System::Object ^ sender, System::EventArgs ^ e);
156+
private: System::Void window_ide_LocationChanged(System::Object ^ sender, System::EventArgs ^ e);
157+
private: System::Void window_ide_FormClosing(System::Object ^ sender, System::Windows::Forms::FormClosingEventArgs ^ e);
158+
private: System::Void window_ide_Activated(System::Object ^ sender, System::EventArgs ^ e);
159+
private: System::Void window_ide_Deactivate(System::Object ^ sender, System::EventArgs ^ e);
162160
};
163161
}

‎src/editors/xrWeatherEditor/window_levels.h‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@ using namespace System::Windows::Forms;
66
using namespace System::Data;
77
using namespace System::Drawing;
88

9+
namespace editor
10+
{
11+
ref class window_levels;
12+
}
13+
914
namespace editor
1015
{
1116
ref class window_ide;
@@ -42,12 +47,9 @@ ref class window_levels : public WeifenLuo::WinFormsUI::Docking::DockContent
4247
}
4348
}
4449

45-
private:
46-
XRay::SdkControls::PropertyGrid ^ PropertyGrid;
47-
48-
protected:
49-
protected:
5050
protected:
51+
private: XRay::SdkControls::PropertyGrid ^ PropertyGrid;
52+
5153
private:
5254
/// <summary>
5355
/// Required designer variable.
@@ -92,7 +94,6 @@ ref class window_levels : public WeifenLuo::WinFormsUI::Docking::DockContent
9294
public:
9395
inline ::PropertyGrid ^ property_grid() { return this->PropertyGrid; }
9496

95-
private : System::Void window_levels_Leave(System::Object ^ sender, System::EventArgs ^ e);
97+
private: System::Void window_levels_Leave(System::Object ^ sender, System::EventArgs ^ e);
9698
}; // ref class window_levels
97-
9899
} // namespace editor

‎src/editors/xrWeatherEditor/window_tree_values.h‎

Lines changed: 26 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@ using namespace System::Windows::Forms;
88
using namespace System::Data;
99
using namespace System::Drawing;
1010

11+
namespace editor
12+
{
13+
ref class window_tree_values;
14+
}
15+
1116
namespace editor
1217
{
1318
/// <summary>
@@ -43,58 +48,28 @@ ref class window_tree_values : public System::Windows::Forms::Form
4348
}
4449
}
4550

46-
private:
47-
System::Windows::Forms::Panel ^ panel2;
48-
4951
protected:
50-
private:
51-
System::Windows::Forms::Panel ^ panel3;
52-
53-
private:
54-
System::Windows::Forms::Panel ^ panel4;
55-
56-
private:
57-
System::Windows::Forms::Panel ^ panel1;
58-
59-
private:
60-
System::Windows::Forms::Panel ^ panel5;
61-
62-
private:
63-
System::Windows::Forms::Panel ^ panel6;
64-
65-
private:
66-
System::Windows::Forms::TreeView ^ TreeView;
67-
68-
private:
69-
System::Windows::Forms::Panel ^ panel7;
70-
71-
private:
72-
System::Windows::Forms::ImageList ^ Images;
73-
74-
private:
75-
System::Windows::Forms::Panel ^ panel10;
76-
77-
private:
78-
System::Windows::Forms::TextBox ^ TextBox;
79-
80-
private:
81-
System::Windows::Forms::Panel ^ panel8;
82-
83-
private:
84-
System::Windows::Forms::Button ^ OK_Button;
85-
86-
private:
87-
System::Windows::Forms::Button ^ Cancel_Button;
52+
private: System::Windows::Forms::Panel ^ panel2;
53+
private: System::Windows::Forms::Panel ^ panel3;
54+
private: System::Windows::Forms::Panel ^ panel4;
55+
private: System::Windows::Forms::Panel ^ panel1;
56+
private: System::Windows::Forms::Panel ^ panel5;
57+
private: System::Windows::Forms::Panel ^ panel6;
58+
private: System::Windows::Forms::TreeView ^ TreeView;
59+
private: System::Windows::Forms::Panel ^ panel7;
60+
private: System::Windows::Forms::ImageList ^ Images;
61+
private: System::Windows::Forms::Panel ^ panel10;
62+
private: System::Windows::Forms::TextBox ^ TextBox;
63+
private: System::Windows::Forms::Panel ^ panel8;
64+
private: System::Windows::Forms::Button ^ OK_Button;
65+
private: System::Windows::Forms::Button ^ Cancel_Button;
8866

8967
private:
68+
/// <summary>
69+
/// Required designer variable.
70+
/// </summary>
9071
System::ComponentModel::IContainer ^ components;
9172

92-
protected:
93-
private:
94-
/// <summary>
95-
/// Required designer variable.
96-
/// </summary>
97-
9873
#pragma region Windows Form Designer generated code
9974
/// <summary>
10075
/// Required method for Designer support - do not modify
@@ -296,10 +271,9 @@ ref class window_tree_values : public System::Windows::Forms::Form
296271
public:
297272
System::String ^ Result;
298273

299-
private:
300-
System::Void TreeView_AfterCollapse(Object ^ sender, TreeViewEventArgs ^ e);
301-
System::Void TreeView_AfterExpand(Object ^ sender, TreeViewEventArgs ^ e);
302-
System::Void TreeView_MouseClick(Object ^ sender, MouseEventArgs ^ e);
303-
System::Void TreeView_MouseDoubleClick(Object ^ sender, MouseEventArgs ^ e);
274+
private: System::Void TreeView_AfterCollapse(Object ^ sender, TreeViewEventArgs ^ e);
275+
private: System::Void TreeView_AfterExpand(Object ^ sender, TreeViewEventArgs ^ e);
276+
private: System::Void TreeView_MouseClick(Object ^ sender, MouseEventArgs ^ e);
277+
private: System::Void TreeView_MouseDoubleClick(Object ^ sender, MouseEventArgs ^ e);
304278
};
305279
}

‎src/editors/xrWeatherEditor/window_view.h‎

Lines changed: 25 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@ using namespace System::Windows::Forms;
66
using namespace System::Data;
77
using namespace System::Drawing;
88

9+
namespace editor
10+
{
11+
ref class window_view;
12+
}
13+
914
namespace editor
1015
{
1116
ref class window_ide;
@@ -43,30 +48,19 @@ ref class window_view : public WeifenLuo::WinFormsUI::Docking::DockContent
4348
}
4449
}
4550

46-
private:
47-
System::Windows::Forms::ToolStrip ^ MainToolBar;
48-
4951
protected:
50-
private:
51-
System::Windows::Forms::ToolStripButton ^ EditButton;
52-
53-
private:
54-
System::Windows::Forms::ToolStripButton ^ PauseButton;
55-
56-
private:
57-
System::Windows::Forms::Panel ^ ViewPanel;
58-
59-
private:
60-
System::Windows::Forms::ImageList ^ imageList1;
52+
private: System::Windows::Forms::ToolStrip ^ MainToolBar;
53+
private: System::Windows::Forms::ToolStripButton ^ EditButton;
54+
private: System::Windows::Forms::ToolStripButton ^ PauseButton;
55+
private: System::Windows::Forms::Panel ^ ViewPanel;
56+
private: System::Windows::Forms::ImageList ^ imageList1;
6157

6258
private:
59+
/// <summary>
60+
/// Required designer variable.
61+
/// </summary>
6362
System::ComponentModel::IContainer ^ components;
6463

65-
private:
66-
/// <summary>
67-
/// Required designer variable.
68-
/// </summary>
69-
7064
#pragma region Windows Form Designer generated code
7165
/// <summary>
7266
/// Required method for Designer support - do not modify
@@ -169,17 +163,18 @@ ref class window_view : public WeifenLuo::WinFormsUI::Docking::DockContent
169163

170164
private:
171165
void custom_init(window_ide % ide);
172-
System::Void window_view_DoubleClick(Object ^ sender, System::EventArgs ^ e);
173-
System::Void window_view_SizeChanged(Object ^ sender, System::EventArgs ^ e);
174-
System::Void window_view_KeyUp(Object ^ sender, KeyEventArgs ^ e);
175-
System::Void EditButton_Click(Object ^ sender, System::EventArgs ^ e);
176-
System::Void PauseButton_Click(Object ^ sender, System::EventArgs ^ e);
177-
System::Void window_view_Paint(Object ^ sender, PaintEventArgs ^ e);
178-
System::Void ViewPanel_MouseMove(Object ^ sender, MouseEventArgs ^ e);
179-
System::Void ViewPanel_MouseDown(Object ^ sender, MouseEventArgs ^ e);
180-
System::Void ViewPanel_MouseLeave(Object ^ sender, System::EventArgs ^ e);
181-
System::Void ViewPanel_MouseClick(Object ^ sender, MouseEventArgs ^ e);
182-
System::Void window_view_KeyDown(Object ^ sender, KeyEventArgs ^ e);
166+
167+
private: System::Void window_view_DoubleClick(Object ^ sender, System::EventArgs ^ e);
168+
private: System::Void window_view_SizeChanged(Object ^ sender, System::EventArgs ^ e);
169+
private: System::Void window_view_KeyUp(Object ^ sender, KeyEventArgs ^ e);
170+
private: System::Void EditButton_Click(Object ^ sender, System::EventArgs ^ e);
171+
private: System::Void PauseButton_Click(Object ^ sender, System::EventArgs ^ e);
172+
private: System::Void window_view_Paint(Object ^ sender, PaintEventArgs ^ e);
173+
private: System::Void ViewPanel_MouseMove(Object ^ sender, MouseEventArgs ^ e);
174+
private: System::Void ViewPanel_MouseDown(Object ^ sender, MouseEventArgs ^ e);
175+
private: System::Void ViewPanel_MouseLeave(Object ^ sender, System::EventArgs ^ e);
176+
private: System::Void ViewPanel_MouseClick(Object ^ sender, MouseEventArgs ^ e);
177+
private: System::Void window_view_KeyDown(Object ^ sender, KeyEventArgs ^ e);
183178
}; // ref class window_view
184179

185180
} // namespace editor

‎src/editors/xrWeatherEditor/window_weather.h‎

Lines changed: 15 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@ using namespace System::Windows::Forms;
66
using namespace System::Data;
77
using namespace System::Drawing;
88

9+
namespace editor
10+
{
11+
ref class window_weather;
12+
}
13+
914
namespace editor
1015
{
1116
ref class window_ide;
@@ -42,23 +47,13 @@ ref class window_weather : public WeifenLuo::WinFormsUI::Docking::DockContent
4247
}
4348
}
4449

45-
private:
46-
System::Windows::Forms::ToolStrip ^ toolStrip1;
47-
48-
private:
49-
System::Windows::Forms::ToolStripButton ^ SaveButton;
50-
51-
private:
52-
XRay::SdkControls::PropertyGrid ^ PropertyGrid;
53-
54-
private:
55-
System::Windows::Forms::ToolStripButton ^ ReloadWeatherButton;
56-
57-
private:
58-
System::Windows::Forms::ToolStripButton ^ ReloadAllWeathersButton;
59-
60-
protected:
6150
protected:
51+
private: System::Windows::Forms::ToolStrip ^ toolStrip1;
52+
private: System::Windows::Forms::ToolStripButton ^ SaveButton;
53+
private: XRay::SdkControls::PropertyGrid ^ PropertyGrid;
54+
private: System::Windows::Forms::ToolStripButton ^ ReloadWeatherButton;
55+
private: System::Windows::Forms::ToolStripButton ^ ReloadAllWeathersButton;
56+
6257
private:
6358
/// <summary>
6459
/// Required designer variable.
@@ -138,10 +133,10 @@ ref class window_weather : public WeifenLuo::WinFormsUI::Docking::DockContent
138133
public:
139134
inline ::PropertyGrid ^ property_grid() { return this->PropertyGrid; }
140135

141-
private : System::Void window_weather_Leave(Object ^ sender, System::EventArgs ^ e);
142-
System::Void SaveButton_Click(Object ^ sender, System::EventArgs ^ e);
143-
System::Void ReloadWeatherButton_Click(Object ^ sender, System::EventArgs ^ e);
144-
System::Void ReloadAllWeathersButton_Click(Object ^ sender, System::EventArgs ^ e);
136+
private: System::Void window_weather_Leave(Object ^ sender, System::EventArgs ^ e);
137+
private: System::Void SaveButton_Click(Object ^ sender, System::EventArgs ^ e);
138+
private: System::Void ReloadWeatherButton_Click(Object ^ sender, System::EventArgs ^ e);
139+
private: System::Void ReloadAllWeathersButton_Click(Object ^ sender, System::EventArgs ^ e);
145140
}; // ref class window_weather
146141

147142
} // namespace editor

0 commit comments

Comments
 (0)