Skip to content

Commit

Permalink
Try to fix xrWeatherEditor forms load/save error in Visual Studio.
Browse files Browse the repository at this point in the history
  • Loading branch information
@intorr
intorr committed Jan 4, 2018
1 parent f97a69d commit 451d116
Show file tree
Hide file tree
Showing 6 changed files with 165 additions and 316 deletions.
14 changes: 6 additions & 8 deletions src/editors/xrWeatherEditor/window_ide.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,7 @@ public ref class window_ide : public System::Windows::Forms::Form
}

protected:
private:
WeifenLuo::WinFormsUI::Docking::DockPanel ^ EditorDock;
private: WeifenLuo::WinFormsUI::Docking::DockPanel ^ EditorDock;

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

private:
System::Void window_ide_SizeChanged(System::Object ^ sender, System::EventArgs ^ e);
System::Void window_ide_LocationChanged(System::Object ^ sender, System::EventArgs ^ e);
System::Void window_ide_FormClosing(System::Object ^ sender, System::Windows::Forms::FormClosingEventArgs ^ e);
System::Void window_ide_Activated(System::Object ^ sender, System::EventArgs ^ e);
System::Void window_ide_Deactivate(System::Object ^ sender, System::EventArgs ^ e);
private: System::Void window_ide_SizeChanged(System::Object ^ sender, System::EventArgs ^ e);
private: System::Void window_ide_LocationChanged(System::Object ^ sender, System::EventArgs ^ e);
private: System::Void window_ide_FormClosing(System::Object ^ sender, System::Windows::Forms::FormClosingEventArgs ^ e);
private: System::Void window_ide_Activated(System::Object ^ sender, System::EventArgs ^ e);
private: System::Void window_ide_Deactivate(System::Object ^ sender, System::EventArgs ^ e);
};
}
15 changes: 8 additions & 7 deletions src/editors/xrWeatherEditor/window_levels.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ using namespace System::Windows::Forms;
using namespace System::Data;
using namespace System::Drawing;

namespace editor
{
ref class window_levels;
}

namespace editor
{
ref class window_ide;
Expand Down Expand Up @@ -42,12 +47,9 @@ ref class window_levels : public WeifenLuo::WinFormsUI::Docking::DockContent
}
}

private:
XRay::SdkControls::PropertyGrid ^ PropertyGrid;

protected:
protected:
protected:
private: XRay::SdkControls::PropertyGrid ^ PropertyGrid;

private:
/// <summary>
/// Required designer variable.
Expand Down Expand Up @@ -92,7 +94,6 @@ ref class window_levels : public WeifenLuo::WinFormsUI::Docking::DockContent
public:
inline ::PropertyGrid ^ property_grid() { return this->PropertyGrid; }

private : System::Void window_levels_Leave(System::Object ^ sender, System::EventArgs ^ e);
private: System::Void window_levels_Leave(System::Object ^ sender, System::EventArgs ^ e);
}; // ref class window_levels

} // namespace editor
78 changes: 26 additions & 52 deletions src/editors/xrWeatherEditor/window_tree_values.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@ using namespace System::Windows::Forms;
using namespace System::Data;
using namespace System::Drawing;

namespace editor
{
ref class window_tree_values;
}

namespace editor
{
/// <summary>
Expand Down Expand Up @@ -43,58 +48,28 @@ ref class window_tree_values : public System::Windows::Forms::Form
}
}

private:
System::Windows::Forms::Panel ^ panel2;

protected:
private:
System::Windows::Forms::Panel ^ panel3;

private:
System::Windows::Forms::Panel ^ panel4;

private:
System::Windows::Forms::Panel ^ panel1;

private:
System::Windows::Forms::Panel ^ panel5;

private:
System::Windows::Forms::Panel ^ panel6;

private:
System::Windows::Forms::TreeView ^ TreeView;

private:
System::Windows::Forms::Panel ^ panel7;

private:
System::Windows::Forms::ImageList ^ Images;

private:
System::Windows::Forms::Panel ^ panel10;

private:
System::Windows::Forms::TextBox ^ TextBox;

private:
System::Windows::Forms::Panel ^ panel8;

private:
System::Windows::Forms::Button ^ OK_Button;

private:
System::Windows::Forms::Button ^ Cancel_Button;
private: System::Windows::Forms::Panel ^ panel2;
private: System::Windows::Forms::Panel ^ panel3;
private: System::Windows::Forms::Panel ^ panel4;
private: System::Windows::Forms::Panel ^ panel1;
private: System::Windows::Forms::Panel ^ panel5;
private: System::Windows::Forms::Panel ^ panel6;
private: System::Windows::Forms::TreeView ^ TreeView;
private: System::Windows::Forms::Panel ^ panel7;
private: System::Windows::Forms::ImageList ^ Images;
private: System::Windows::Forms::Panel ^ panel10;
private: System::Windows::Forms::TextBox ^ TextBox;
private: System::Windows::Forms::Panel ^ panel8;
private: System::Windows::Forms::Button ^ OK_Button;
private: System::Windows::Forms::Button ^ Cancel_Button;

private:
/// <summary>
/// Required designer variable.
/// </summary>
System::ComponentModel::IContainer ^ components;

protected:
private:
/// <summary>
/// Required designer variable.
/// </summary>

#pragma region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
Expand Down Expand Up @@ -296,10 +271,9 @@ ref class window_tree_values : public System::Windows::Forms::Form
public:
System::String ^ Result;

private:
System::Void TreeView_AfterCollapse(Object ^ sender, TreeViewEventArgs ^ e);
System::Void TreeView_AfterExpand(Object ^ sender, TreeViewEventArgs ^ e);
System::Void TreeView_MouseClick(Object ^ sender, MouseEventArgs ^ e);
System::Void TreeView_MouseDoubleClick(Object ^ sender, MouseEventArgs ^ e);
private: System::Void TreeView_AfterCollapse(Object ^ sender, TreeViewEventArgs ^ e);
private: System::Void TreeView_AfterExpand(Object ^ sender, TreeViewEventArgs ^ e);
private: System::Void TreeView_MouseClick(Object ^ sender, MouseEventArgs ^ e);
private: System::Void TreeView_MouseDoubleClick(Object ^ sender, MouseEventArgs ^ e);
};
}
55 changes: 25 additions & 30 deletions src/editors/xrWeatherEditor/window_view.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ using namespace System::Windows::Forms;
using namespace System::Data;
using namespace System::Drawing;

namespace editor
{
ref class window_view;
}

namespace editor
{
ref class window_ide;
Expand Down Expand Up @@ -43,30 +48,19 @@ ref class window_view : public WeifenLuo::WinFormsUI::Docking::DockContent
}
}

private:
System::Windows::Forms::ToolStrip ^ MainToolBar;

protected:
private:
System::Windows::Forms::ToolStripButton ^ EditButton;

private:
System::Windows::Forms::ToolStripButton ^ PauseButton;

private:
System::Windows::Forms::Panel ^ ViewPanel;

private:
System::Windows::Forms::ImageList ^ imageList1;
private: System::Windows::Forms::ToolStrip ^ MainToolBar;
private: System::Windows::Forms::ToolStripButton ^ EditButton;
private: System::Windows::Forms::ToolStripButton ^ PauseButton;
private: System::Windows::Forms::Panel ^ ViewPanel;
private: System::Windows::Forms::ImageList ^ imageList1;

private:
/// <summary>
/// Required designer variable.
/// </summary>
System::ComponentModel::IContainer ^ components;

private:
/// <summary>
/// Required designer variable.
/// </summary>

#pragma region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
Expand Down Expand Up @@ -169,17 +163,18 @@ ref class window_view : public WeifenLuo::WinFormsUI::Docking::DockContent

private:
void custom_init(window_ide % ide);
System::Void window_view_DoubleClick(Object ^ sender, System::EventArgs ^ e);
System::Void window_view_SizeChanged(Object ^ sender, System::EventArgs ^ e);
System::Void window_view_KeyUp(Object ^ sender, KeyEventArgs ^ e);
System::Void EditButton_Click(Object ^ sender, System::EventArgs ^ e);
System::Void PauseButton_Click(Object ^ sender, System::EventArgs ^ e);
System::Void window_view_Paint(Object ^ sender, PaintEventArgs ^ e);
System::Void ViewPanel_MouseMove(Object ^ sender, MouseEventArgs ^ e);
System::Void ViewPanel_MouseDown(Object ^ sender, MouseEventArgs ^ e);
System::Void ViewPanel_MouseLeave(Object ^ sender, System::EventArgs ^ e);
System::Void ViewPanel_MouseClick(Object ^ sender, MouseEventArgs ^ e);
System::Void window_view_KeyDown(Object ^ sender, KeyEventArgs ^ e);

private: System::Void window_view_DoubleClick(Object ^ sender, System::EventArgs ^ e);
private: System::Void window_view_SizeChanged(Object ^ sender, System::EventArgs ^ e);
private: System::Void window_view_KeyUp(Object ^ sender, KeyEventArgs ^ e);
private: System::Void EditButton_Click(Object ^ sender, System::EventArgs ^ e);
private: System::Void PauseButton_Click(Object ^ sender, System::EventArgs ^ e);
private: System::Void window_view_Paint(Object ^ sender, PaintEventArgs ^ e);
private: System::Void ViewPanel_MouseMove(Object ^ sender, MouseEventArgs ^ e);
private: System::Void ViewPanel_MouseDown(Object ^ sender, MouseEventArgs ^ e);
private: System::Void ViewPanel_MouseLeave(Object ^ sender, System::EventArgs ^ e);
private: System::Void ViewPanel_MouseClick(Object ^ sender, MouseEventArgs ^ e);
private: System::Void window_view_KeyDown(Object ^ sender, KeyEventArgs ^ e);
}; // ref class window_view

} // namespace editor
35 changes: 15 additions & 20 deletions src/editors/xrWeatherEditor/window_weather.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ using namespace System::Windows::Forms;
using namespace System::Data;
using namespace System::Drawing;

namespace editor
{
ref class window_weather;
}

namespace editor
{
ref class window_ide;
Expand Down Expand Up @@ -42,23 +47,13 @@ ref class window_weather : public WeifenLuo::WinFormsUI::Docking::DockContent
}
}

private:
System::Windows::Forms::ToolStrip ^ toolStrip1;

private:
System::Windows::Forms::ToolStripButton ^ SaveButton;

private:
XRay::SdkControls::PropertyGrid ^ PropertyGrid;

private:
System::Windows::Forms::ToolStripButton ^ ReloadWeatherButton;

private:
System::Windows::Forms::ToolStripButton ^ ReloadAllWeathersButton;

protected:
protected:
private: System::Windows::Forms::ToolStrip ^ toolStrip1;
private: System::Windows::Forms::ToolStripButton ^ SaveButton;
private: XRay::SdkControls::PropertyGrid ^ PropertyGrid;
private: System::Windows::Forms::ToolStripButton ^ ReloadWeatherButton;
private: System::Windows::Forms::ToolStripButton ^ ReloadAllWeathersButton;

private:
/// <summary>
/// Required designer variable.
Expand Down Expand Up @@ -138,10 +133,10 @@ ref class window_weather : public WeifenLuo::WinFormsUI::Docking::DockContent
public:
inline ::PropertyGrid ^ property_grid() { return this->PropertyGrid; }

private : System::Void window_weather_Leave(Object ^ sender, System::EventArgs ^ e);
System::Void SaveButton_Click(Object ^ sender, System::EventArgs ^ e);
System::Void ReloadWeatherButton_Click(Object ^ sender, System::EventArgs ^ e);
System::Void ReloadAllWeathersButton_Click(Object ^ sender, System::EventArgs ^ e);
private: System::Void window_weather_Leave(Object ^ sender, System::EventArgs ^ e);
private: System::Void SaveButton_Click(Object ^ sender, System::EventArgs ^ e);
private: System::Void ReloadWeatherButton_Click(Object ^ sender, System::EventArgs ^ e);
private: System::Void ReloadAllWeathersButton_Click(Object ^ sender, System::EventArgs ^ e);
}; // ref class window_weather

} // namespace editor
Loading

0 comments on commit 451d116

Please sign in to comment.