Skip to content

Commit f97a69d

Browse files
intorrintorr
committed
Try to upgrade WeifenLuo.WinFormsUI.Docking to latest version.
1 parent ad74c46 commit f97a69d

File tree

10 files changed

+25
-29
lines changed

10 files changed

+25
-29
lines changed

‎sdk/binaries/DockPanelSkin.dll‎

-100 KB
Binary file not shown.

‎sdk/binaries/WeifenLuo.WinFormsUI.Docking.dll‎

-100 KB
Binary file not shown.

‎src/editors/xrWeatherEditor/window_ide.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ using editor::window_levels;
1212
using editor::window_weather;
1313
using editor::window_weather_editor;
1414

15-
using VS2005Style::Extender;
15+
//using WeifenLuo::WinFormsUI::Docking::VS2005Theme;
1616

1717
void window_ide::custom_init(XRay::Editor::engine_base* engine)
1818
{
1919
SuspendLayout();
2020

2121
m_engine = engine;
2222

23-
Extender::SetSchema(EditorDock, Extender::Schema::FromBase);
23+
//Extender::SetSchema(EditorDock, Extender::Schema::FromBase);
2424

2525
m_view = gcnew window_view(*this);
2626
m_levels = gcnew window_levels(this);

‎src/editors/xrWeatherEditor/window_ide.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public ref class window_ide : public System::Windows::Forms::Form
7171

7272
protected:
7373
private:
74-
WeifenLuo::WinFormsUI::DockPanel ^ EditorDock;
74+
WeifenLuo::WinFormsUI::Docking::DockPanel ^ EditorDock;
7575

7676
private:
7777
/// <summary>
@@ -86,14 +86,14 @@ public ref class window_ide : public System::Windows::Forms::Form
8686
/// </summary>
8787
void InitializeComponent(void)
8888
{
89-
this->EditorDock = (gcnew WeifenLuo::WinFormsUI::DockPanel());
89+
this->EditorDock = (gcnew WeifenLuo::WinFormsUI::Docking::DockPanel());
9090
this->SuspendLayout();
9191
//
9292
// EditorDock
9393
//
9494
this->EditorDock->ActiveAutoHideContent = nullptr;
9595
this->EditorDock->Dock = System::Windows::Forms::DockStyle::Fill;
96-
this->EditorDock->DocumentStyle = WeifenLuo::WinFormsUI::DocumentStyles::DockingSdi;
96+
this->EditorDock->DocumentStyle = WeifenLuo::WinFormsUI::Docking::DocumentStyle::DockingSdi;
9797
this->EditorDock->Font = (gcnew System::Drawing::Font(L"Tahoma", 11, System::Drawing::FontStyle::Regular, System::Drawing::GraphicsUnit::World));
9898
this->EditorDock->Location = System::Drawing::Point(0, 0);
9999
this->EditorDock->Name = L"EditorDock";
@@ -151,7 +151,7 @@ public ref class window_ide : public System::Windows::Forms::Form
151151
void load_on_create();
152152

153153
private:
154-
WeifenLuo::WinFormsUI::IDockContent ^ reload_content(System::String ^ persist_string);
154+
WeifenLuo::WinFormsUI::Docking::IDockContent ^ reload_content(System::String ^ persist_string);
155155

156156
private:
157157
System::Void window_ide_SizeChanged(System::Object ^ sender, System::EventArgs ^ e);

‎src/editors/xrWeatherEditor/window_ide_serialize.cpp‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ void window_ide::save_on_exit()
9494
product->Close();
9595
}
9696

97-
WeifenLuo::WinFormsUI::IDockContent ^ window_ide::reload_content(System::String ^ persist_string)
97+
WeifenLuo::WinFormsUI::Docking::IDockContent ^ window_ide::reload_content(System::String ^ persist_string)
9898
{
9999
if (persist_string == "editor.window_view")
100100
return (m_view);
@@ -175,8 +175,7 @@ void window_ide::load_on_create()
175175
MemoryStream ^ stream = gcnew MemoryStream();
176176
stream->Write(safe_cast<array<unsigned char, 1> ^>(object), 0, object->Length);
177177
stream->Seek(0, System::IO::SeekOrigin::Begin);
178-
EditorDock->LoadFromXml(
179-
stream, gcnew WeifenLuo::WinFormsUI::DeserializeDockContent(this, &window_ide::reload_content));
178+
EditorDock->LoadFromXml(stream, gcnew WeifenLuo::WinFormsUI::Docking::DeserializeDockContent(this, &window_ide::reload_content));
180179
delete (stream);
181180
return;
182181
}
@@ -188,10 +187,10 @@ void window_ide::load_on_create()
188187
product->Close();
189188
delete (product);
190189

191-
m_view->Show(EditorDock, WeifenLuo::WinFormsUI::DockState::Document);
192-
m_levels->Show(EditorDock, WeifenLuo::WinFormsUI::DockState::DockRight);
193-
m_weather->Show(EditorDock, WeifenLuo::WinFormsUI::DockState::DockRight);
194-
m_weather_editor->Show(EditorDock, WeifenLuo::WinFormsUI::DockState::DockRight);
190+
m_view->Show(EditorDock, WeifenLuo::WinFormsUI::Docking::DockState::Document);
191+
m_levels->Show(EditorDock, WeifenLuo::WinFormsUI::Docking::DockState::DockRight);
192+
m_weather->Show(EditorDock, WeifenLuo::WinFormsUI::Docking::DockState::DockRight);
193+
m_weather_editor->Show(EditorDock, WeifenLuo::WinFormsUI::Docking::DockState::DockRight);
195194

196195
this->WindowState = FormWindowState::Maximized;
197196
}

‎src/editors/xrWeatherEditor/window_levels.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ ref class window_ide;
1919
/// resources associated with this form.
2020
/// </summary>
2121
public
22-
ref class window_levels : public WeifenLuo::WinFormsUI::DockContent
22+
ref class window_levels : public WeifenLuo::WinFormsUI::Docking::DockContent
2323
{
2424
public:
2525
window_levels(window_ide ^ ide) : m_ide(ide)
@@ -73,10 +73,10 @@ ref class window_levels : public WeifenLuo::WinFormsUI::DockContent
7373
this->AutoScaleMode = System::Windows::Forms::AutoScaleMode::Font;
7474
this->ClientSize = System::Drawing::Size(292, 273);
7575
this->Controls->Add(this->PropertyGrid);
76-
this->DockableAreas = static_cast<WeifenLuo::WinFormsUI::DockAreas>(((((WeifenLuo::WinFormsUI::DockAreas::Float | WeifenLuo::WinFormsUI::DockAreas::DockLeft)
77-
| WeifenLuo::WinFormsUI::DockAreas::DockRight)
78-
| WeifenLuo::WinFormsUI::DockAreas::DockTop)
79-
| WeifenLuo::WinFormsUI::DockAreas::DockBottom));
76+
this->DockAreas = static_cast<WeifenLuo::WinFormsUI::Docking::DockAreas>(((((WeifenLuo::WinFormsUI::Docking::DockAreas::Float | WeifenLuo::WinFormsUI::Docking::DockAreas::DockLeft)
77+
| WeifenLuo::WinFormsUI::Docking::DockAreas::DockRight)
78+
| WeifenLuo::WinFormsUI::Docking::DockAreas::DockTop)
79+
| WeifenLuo::WinFormsUI::Docking::DockAreas::DockBottom));
8080
this->HideOnClose = true;
8181
this->Name = L"window_levels";
8282
this->TabText = L"level weathers";

‎src/editors/xrWeatherEditor/window_view.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ ref class window_ide;
1919
/// resources associated with this form.
2020
/// </summary>
2121
public
22-
ref class window_view : public WeifenLuo::WinFormsUI::DockContent
22+
ref class window_view : public WeifenLuo::WinFormsUI::Docking::DockContent
2323
{
2424
public:
2525
window_view(window_ide % ide)
@@ -124,7 +124,7 @@ ref class window_view : public WeifenLuo::WinFormsUI::DockContent
124124
this->CloseButton = false;
125125
this->Controls->Add(this->ViewPanel);
126126
this->Controls->Add(this->MainToolBar);
127-
this->DockableAreas = WeifenLuo::WinFormsUI::DockAreas::Document;
127+
this->DockAreas = WeifenLuo::WinFormsUI::Docking::DockAreas::Document;
128128
this->HideOnClose = true;
129129
this->KeyPreview = true;
130130
this->Name = L"window_view";

‎src/editors/xrWeatherEditor/window_weather.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ ref class window_ide;
1919
/// resources associated with this form.
2020
/// </summary>
2121
public
22-
ref class window_weather : public WeifenLuo::WinFormsUI::DockContent
22+
ref class window_weather : public WeifenLuo::WinFormsUI::Docking::DockContent
2323
{
2424
public:
2525
window_weather(window_ide ^ ide) : m_ide(ide)

‎src/editors/xrWeatherEditor/window_weather_editor.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ ref class window_ide;
3333
/// the designers will not be able to interact properly with localized
3434
/// resources associated with this form.
3535
/// </summary>
36-
public ref class window_weather_editor : public WeifenLuo::WinFormsUI::DockContent
36+
public ref class window_weather_editor : public WeifenLuo::WinFormsUI::Docking::DockContent
3737
{
3838
public:
3939
window_weather_editor(window_ide ^ ide, XRay::Editor::engine_base* engine)

‎src/editors/xrWeatherEditor/xrWeatherEditor.vcxproj‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -132,20 +132,17 @@
132132
</ClCompile>
133133
</ItemDefinitionGroup>
134134
<ItemGroup>
135-
<Reference Include="DockPanelSkin">
136-
<HintPath>$(xrSdkDir)binaries\DockPanelSkin.dll</HintPath>
137-
</Reference>
138135
<Reference Include="Flobbster.Windows.Forms.PropertyGrid">
139-
<HintPath>$(xrSdkDir)binaries\Flobbster.Windows.Forms.PropertyGrid.dll</HintPath>
140-
</Reference>
141-
<Reference Include="WeifenLuo.WinFormsUI.Docking">
142-
<HintPath>$(xrSdkDir)binaries\WeifenLuo.WinFormsUI.Docking.dll</HintPath>
136+
<HintPath>..\..\..\sdk\binaries\Flobbster.Windows.Forms.PropertyGrid.dll</HintPath>
143137
</Reference>
144138
<Reference Include="System" />
145139
<Reference Include="System.Data" />
146140
<Reference Include="System.Design" />
147141
<Reference Include="System.Drawing" />
148142
<Reference Include="System.Windows.Forms" />
143+
<Reference Include="WeifenLuo.WinFormsUI.Docking, Version=3.0.3.0, Culture=neutral, PublicKeyToken=5cded1a1a0a7b481">
144+
<HintPath>..\..\..\sdk\binaries\WeifenLuo.WinFormsUI.Docking.dll</HintPath>
145+
</Reference>
149146
</ItemGroup>
150147
<ItemGroup>
151148
<ClCompile Include="AssemblyInfo.cpp" />

0 commit comments

Comments
 (0)