#5231: Move Splitter to wxutil library

codereader · May 19, 2020 · 7640185 · 7640185
1 parent c7978f6
commit 7640185
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 19 deletions.
diff --git a/libs/wxutil/Makefile.am b/libs/wxutil/Makefile.am
@@ -39,6 +39,7 @@ libwxutil_la_SOURCES = ConsoleView.cpp \
                        GLFont.cpp \
                        menu/PopupMenu.cpp \
                        PathEntry.cpp \
+                       Splitter.cpp \
                        TreeModel.cpp \
                        TreeView.cpp \
                        TreeModelFilter.cpp \

diff --git a/radiant/ui/widgets/Splitter.cpp → libs/wxutil/Splitter.cpp b/radiant/ui/widgets/Splitter.cpp → libs/wxutil/Splitter.cpp
@@ -4,7 +4,7 @@
 
 #include <wx/event.h>
 
-namespace ui
+namespace wxutil
 {
 
 Splitter::Splitter(wxWindow* parent, const std::string& registryKey, long style,

diff --git a/radiant/ui/widgets/Splitter.h → libs/wxutil/Splitter.h b/radiant/ui/widgets/Splitter.h → libs/wxutil/Splitter.h
@@ -2,7 +2,7 @@
 
 #include <wx/splitter.h>
 
-namespace ui
+namespace wxutil
 {
 
 /// Subclass of wxSplitterWindow that provides splitter position persistence

diff --git a/radiant/Makefile.am b/radiant/Makefile.am
@@ -233,7 +233,6 @@ darkradiant_SOURCES = main.cpp \
                       ui/mousetool/ToolMappingDialog.cpp \
 					  ui/aas/AasControl.cpp \
 					  ui/aas/AasControlDialog.cpp \
-                      ui/widgets/Splitter.cpp \
                       uimanager/SoundChooser.cpp \
                       uimanager/StatusBarManager.cpp \
                       uimanager/animationpreview/MD5AnimationChooser.cpp \

diff --git a/radiant/ui/mainframe/EmbeddedLayout.cpp b/radiant/ui/mainframe/EmbeddedLayout.cpp
@@ -36,7 +36,7 @@ void EmbeddedLayout::activate()
     wxFrame* topLevelParent = GlobalMainFrame().getWxTopLevelWindow();
 
     // Splitters
-    _horizPane = new Splitter(
+    _horizPane = new wxutil::Splitter(
         topLevelParent, RKEY_HORIZ_POS, wxSP_LIVE_UPDATE | wxSP_3D | wxWANTS_CHARS,
         "EmbeddedHorizPane"
     );
@@ -47,7 +47,7 @@ void EmbeddedLayout::activate()
     XYWndPtr xywnd = GlobalXYWnd().createEmbeddedOrthoView(XY, _horizPane);
 
     // CamGroup Pane
-    _groupCamPane = new Splitter(
+    _groupCamPane = new wxutil::Splitter(
         _horizPane, RKEY_VERT_POS, wxSP_LIVE_UPDATE | wxSP_3D | wxWANTS_CHARS,
         "EmbeddedVertPane"
     );

diff --git a/radiant/ui/mainframe/EmbeddedLayout.h b/radiant/ui/mainframe/EmbeddedLayout.h
@@ -5,7 +5,7 @@
 #include "imainframelayout.h"
 
 #include "camera/CamWnd.h"
-#include "ui/widgets/Splitter.h"
+#include "wxutil/Splitter.h"
 
 namespace ui
 {
@@ -22,8 +22,8 @@ class EmbeddedLayout :
 	// The camera view
 	CamWndPtr _camWnd;
 
-	Splitter* _horizPane;
-	Splitter* _groupCamPane;
+	wxutil::Splitter* _horizPane;
+	wxutil::Splitter* _groupCamPane;
 
 	struct SavedPositions
 	{

diff --git a/tools/msvc/DarkRadiant.vcxproj b/tools/msvc/DarkRadiant.vcxproj
@@ -900,7 +900,6 @@
     <ClCompile Include="..\..\radiant\ui\mainframe\SplitPaneLayout.cpp" />
     <ClCompile Include="..\..\radiant\ui\brush\QuerySidesDialog.cpp" />
     <ClCompile Include="..\..\radiant\ui\UserInterfaceModule.cpp" />
-    <ClCompile Include="..\..\radiant\ui\widgets\Splitter.cpp" />
     <ClCompile Include="..\..\radiant\xyview\FloatingOrthoView.cpp" />
     <ClCompile Include="..\..\radiant\xyview\GlobalXYWnd.cpp" />
     <ClCompile Include="..\..\radiant\xyview\tools\BrushCreatorTool.cpp" />
@@ -1266,7 +1265,6 @@
     <ClInclude Include="..\..\radiant\ui\mainframe\SplitPaneLayout.h" />
     <ClInclude Include="..\..\radiant\ui\brush\QuerySidesDialog.h" />
     <ClInclude Include="..\..\radiant\ui\UserInterfaceModule.h" />
-    <ClInclude Include="..\..\radiant\ui\widgets\Splitter.h" />
     <ClInclude Include="..\..\radiant\xyview\FloatingOrthoView.h" />
     <ClInclude Include="..\..\radiant\xyview\GlobalXYWnd.h" />
     <ClInclude Include="..\..\radiant\xyview\tools\BrushCreatorTool.h" />

diff --git a/tools/msvc/DarkRadiant.vcxproj.filters b/tools/msvc/DarkRadiant.vcxproj.filters
@@ -212,9 +212,6 @@
     <Filter Include="src\fonts">
       <UniqueIdentifier>{a921dcd3-1518-490e-baf1-4b75bdd130c7}</UniqueIdentifier>
     </Filter>
-    <Filter Include="src\ui\widgets">
-      <UniqueIdentifier>{6f4f3b4f-0cfb-40db-9826-1bbe750981a7}</UniqueIdentifier>
-    </Filter>
     <Filter Include="src\map\format">
       <UniqueIdentifier>{a33db67b-1632-47ad-9368-04d014d7d730}</UniqueIdentifier>
     </Filter>
@@ -1057,9 +1054,6 @@
     <ClCompile Include="..\..\radiant\fonts\GlyphSet.cpp">
       <Filter>src\fonts</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\radiant\ui\widgets\Splitter.cpp">
-      <Filter>src\ui\widgets</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\radiant\ui\Documentation.cpp">
       <Filter>src\ui</Filter>
     </ClCompile>
@@ -2163,9 +2157,6 @@
     <ClInclude Include="..\..\radiant\fonts\GlyphSet.h">
       <Filter>src\fonts</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\radiant\ui\widgets\Splitter.h">
-      <Filter>src\ui\widgets</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\radiant\ui\Documentation.h">
       <Filter>src\ui</Filter>
     </ClInclude>

diff --git a/tools/msvc/wxutillib.vcxproj b/tools/msvc/wxutillib.vcxproj
@@ -178,6 +178,7 @@
     <ClInclude Include="..\..\libs\wxutil\ScrollWindow.h" />
     <ClInclude Include="..\..\libs\wxutil\SerialisableWidgets.h" />
     <ClInclude Include="..\..\libs\wxutil\SourceView.h" />
+    <ClInclude Include="..\..\libs\wxutil\Splitter.h" />
     <ClInclude Include="..\..\libs\wxutil\TreeModel.h" />
     <ClInclude Include="..\..\libs\wxutil\TreeModelFilter.h" />
     <ClInclude Include="..\..\libs\wxutil\TreeView.h" />
@@ -210,6 +211,7 @@
     <ClCompile Include="..\..\libs\wxutil\preview\RenderPreview.cpp" />
     <ClCompile Include="..\..\libs\wxutil\SerialisableWidgets.cpp" />
     <ClCompile Include="..\..\libs\wxutil\SourceView.cpp" />
+    <ClCompile Include="..\..\libs\wxutil\Splitter.cpp" />
     <ClCompile Include="..\..\libs\wxutil\TreeModel.cpp" />
     <ClCompile Include="..\..\libs\wxutil\TreeModelFilter.cpp" />
     <ClCompile Include="..\..\libs\wxutil\TreeView.cpp" />

diff --git a/tools/msvc/wxutillib.vcxproj.filters b/tools/msvc/wxutillib.vcxproj.filters
@@ -104,6 +104,7 @@
     </ClInclude>
     <ClInclude Include="..\..\libs\wxutil\ScrollWindow.h" />
     <ClInclude Include="..\..\libs\wxutil\Button.h" />
+    <ClInclude Include="..\..\libs\wxutil\Splitter.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\libs\wxutil\dialog\MessageBox.cpp">
@@ -155,6 +156,7 @@
     <ClCompile Include="..\..\libs\wxutil\dialog\DialogBase.cpp">
       <Filter>dialog</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\libs\wxutil\Splitter.cpp" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\libs\wxutil\Makefile.am" />