Skip to content

Commit

Permalink
Try to upgrade WeifenLuo.WinFormsUI.Docking to latest version.
Browse files Browse the repository at this point in the history
  • Loading branch information
@intorr
intorr committed Jan 3, 2018
1 parent ad74c46 commit f97a69d
Show file tree
Hide file tree
Showing 10 changed files with 25 additions and 29 deletions.
Binary file removed sdk/binaries/DockPanelSkin.dll
View file
Binary file not shown.
Binary file modified sdk/binaries/WeifenLuo.WinFormsUI.Docking.dll
View file
Binary file not shown.
4 changes: 2 additions & 2 deletions src/editors/xrWeatherEditor/window_ide.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@ using editor::window_levels;
using editor::window_weather;
using editor::window_weather_editor;

using VS2005Style::Extender;
//using WeifenLuo::WinFormsUI::Docking::VS2005Theme;

void window_ide::custom_init(XRay::Editor::engine_base* engine)
{
SuspendLayout();

m_engine = engine;

Extender::SetSchema(EditorDock, Extender::Schema::FromBase);
//Extender::SetSchema(EditorDock, Extender::Schema::FromBase);

m_view = gcnew window_view(*this);
m_levels = gcnew window_levels(this);
Expand Down
8 changes: 4 additions & 4 deletions src/editors/xrWeatherEditor/window_ide.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ public ref class window_ide : public System::Windows::Forms::Form

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

private:
/// <summary>
Expand All @@ -86,14 +86,14 @@ public ref class window_ide : public System::Windows::Forms::Form
/// </summary>
void InitializeComponent(void)
{
this->EditorDock = (gcnew WeifenLuo::WinFormsUI::DockPanel());
this->EditorDock = (gcnew WeifenLuo::WinFormsUI::Docking::DockPanel());
this->SuspendLayout();
//
// EditorDock
//
this->EditorDock->ActiveAutoHideContent = nullptr;
this->EditorDock->Dock = System::Windows::Forms::DockStyle::Fill;
this->EditorDock->DocumentStyle = WeifenLuo::WinFormsUI::DocumentStyles::DockingSdi;
this->EditorDock->DocumentStyle = WeifenLuo::WinFormsUI::Docking::DocumentStyle::DockingSdi;
this->EditorDock->Font = (gcnew System::Drawing::Font(L"Tahoma", 11, System::Drawing::FontStyle::Regular, System::Drawing::GraphicsUnit::World));
this->EditorDock->Location = System::Drawing::Point(0, 0);
this->EditorDock->Name = L"EditorDock";
Expand Down Expand Up @@ -151,7 +151,7 @@ public ref class window_ide : public System::Windows::Forms::Form
void load_on_create();

private:
WeifenLuo::WinFormsUI::IDockContent ^ reload_content(System::String ^ persist_string);
WeifenLuo::WinFormsUI::Docking::IDockContent ^ reload_content(System::String ^ persist_string);

private:
System::Void window_ide_SizeChanged(System::Object ^ sender, System::EventArgs ^ e);
Expand Down
13 changes: 6 additions & 7 deletions src/editors/xrWeatherEditor/window_ide_serialize.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ void window_ide::save_on_exit()
product->Close();
}

WeifenLuo::WinFormsUI::IDockContent ^ window_ide::reload_content(System::String ^ persist_string)
WeifenLuo::WinFormsUI::Docking::IDockContent ^ window_ide::reload_content(System::String ^ persist_string)
{
if (persist_string == "editor.window_view")
return (m_view);
Expand Down Expand Up @@ -175,8 +175,7 @@ void window_ide::load_on_create()
MemoryStream ^ stream = gcnew MemoryStream();
stream->Write(safe_cast<array<unsigned char, 1> ^>(object), 0, object->Length);
stream->Seek(0, System::IO::SeekOrigin::Begin);
EditorDock->LoadFromXml(
stream, gcnew WeifenLuo::WinFormsUI::DeserializeDockContent(this, &window_ide::reload_content));
EditorDock->LoadFromXml(stream, gcnew WeifenLuo::WinFormsUI::Docking::DeserializeDockContent(this, &window_ide::reload_content));
delete (stream);
return;
}
Expand All @@ -188,10 +187,10 @@ void window_ide::load_on_create()
product->Close();
delete (product);

m_view->Show(EditorDock, WeifenLuo::WinFormsUI::DockState::Document);
m_levels->Show(EditorDock, WeifenLuo::WinFormsUI::DockState::DockRight);
m_weather->Show(EditorDock, WeifenLuo::WinFormsUI::DockState::DockRight);
m_weather_editor->Show(EditorDock, WeifenLuo::WinFormsUI::DockState::DockRight);
m_view->Show(EditorDock, WeifenLuo::WinFormsUI::Docking::DockState::Document);
m_levels->Show(EditorDock, WeifenLuo::WinFormsUI::Docking::DockState::DockRight);
m_weather->Show(EditorDock, WeifenLuo::WinFormsUI::Docking::DockState::DockRight);
m_weather_editor->Show(EditorDock, WeifenLuo::WinFormsUI::Docking::DockState::DockRight);

this->WindowState = FormWindowState::Maximized;
}
10 changes: 5 additions & 5 deletions src/editors/xrWeatherEditor/window_levels.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ ref class window_ide;
/// resources associated with this form.
/// </summary>
public
ref class window_levels : public WeifenLuo::WinFormsUI::DockContent
ref class window_levels : public WeifenLuo::WinFormsUI::Docking::DockContent
{
public:
window_levels(window_ide ^ ide) : m_ide(ide)
Expand Down Expand Up @@ -73,10 +73,10 @@ ref class window_levels : public WeifenLuo::WinFormsUI::DockContent
this->AutoScaleMode = System::Windows::Forms::AutoScaleMode::Font;
this->ClientSize = System::Drawing::Size(292, 273);
this->Controls->Add(this->PropertyGrid);
this->DockableAreas = static_cast<WeifenLuo::WinFormsUI::DockAreas>(((((WeifenLuo::WinFormsUI::DockAreas::Float | WeifenLuo::WinFormsUI::DockAreas::DockLeft)
| WeifenLuo::WinFormsUI::DockAreas::DockRight)
| WeifenLuo::WinFormsUI::DockAreas::DockTop)
| WeifenLuo::WinFormsUI::DockAreas::DockBottom));
this->DockAreas = static_cast<WeifenLuo::WinFormsUI::Docking::DockAreas>(((((WeifenLuo::WinFormsUI::Docking::DockAreas::Float | WeifenLuo::WinFormsUI::Docking::DockAreas::DockLeft)
| WeifenLuo::WinFormsUI::Docking::DockAreas::DockRight)
| WeifenLuo::WinFormsUI::Docking::DockAreas::DockTop)
| WeifenLuo::WinFormsUI::Docking::DockAreas::DockBottom));
this->HideOnClose = true;
this->Name = L"window_levels";
this->TabText = L"level weathers";
Expand Down
4 changes: 2 additions & 2 deletions src/editors/xrWeatherEditor/window_view.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ ref class window_ide;
/// resources associated with this form.
/// </summary>
public
ref class window_view : public WeifenLuo::WinFormsUI::DockContent
ref class window_view : public WeifenLuo::WinFormsUI::Docking::DockContent
{
public:
window_view(window_ide % ide)
Expand Down Expand Up @@ -124,7 +124,7 @@ ref class window_view : public WeifenLuo::WinFormsUI::DockContent
this->CloseButton = false;
this->Controls->Add(this->ViewPanel);
this->Controls->Add(this->MainToolBar);
this->DockableAreas = WeifenLuo::WinFormsUI::DockAreas::Document;
this->DockAreas = WeifenLuo::WinFormsUI::Docking::DockAreas::Document;
this->HideOnClose = true;
this->KeyPreview = true;
this->Name = L"window_view";
Expand Down
2 changes: 1 addition & 1 deletion src/editors/xrWeatherEditor/window_weather.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ ref class window_ide;
/// resources associated with this form.
/// </summary>
public
ref class window_weather : public WeifenLuo::WinFormsUI::DockContent
ref class window_weather : public WeifenLuo::WinFormsUI::Docking::DockContent
{
public:
window_weather(window_ide ^ ide) : m_ide(ide)
Expand Down
2 changes: 1 addition & 1 deletion src/editors/xrWeatherEditor/window_weather_editor.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ ref class window_ide;
/// the designers will not be able to interact properly with localized
/// resources associated with this form.
/// </summary>
public ref class window_weather_editor : public WeifenLuo::WinFormsUI::DockContent
public ref class window_weather_editor : public WeifenLuo::WinFormsUI::Docking::DockContent
{
public:
window_weather_editor(window_ide ^ ide, XRay::Editor::engine_base* engine)
Expand Down
11 changes: 4 additions & 7 deletions src/editors/xrWeatherEditor/xrWeatherEditor.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,20 +132,17 @@
</ClCompile>
</ItemDefinitionGroup>
<ItemGroup>
<Reference Include="DockPanelSkin">
<HintPath>$(xrSdkDir)binaries\DockPanelSkin.dll</HintPath>
</Reference>
<Reference Include="Flobbster.Windows.Forms.PropertyGrid">
<HintPath>$(xrSdkDir)binaries\Flobbster.Windows.Forms.PropertyGrid.dll</HintPath>
</Reference>
<Reference Include="WeifenLuo.WinFormsUI.Docking">
<HintPath>$(xrSdkDir)binaries\WeifenLuo.WinFormsUI.Docking.dll</HintPath>
<HintPath>..\..\..\sdk\binaries\Flobbster.Windows.Forms.PropertyGrid.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Design" />
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Reference Include="WeifenLuo.WinFormsUI.Docking, Version=3.0.3.0, Culture=neutral, PublicKeyToken=5cded1a1a0a7b481">
<HintPath>..\..\..\sdk\binaries\WeifenLuo.WinFormsUI.Docking.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<ClCompile Include="AssemblyInfo.cpp" />
Expand Down

0 comments on commit f97a69d

Please sign in to comment.