#6131: XYWnds need to register/deregister themselves on construction/…

…destruction Refactor the whole active XY view handling code. Fix Linux compilation.
codereader · Oct 26, 2022 · 1884104 · 1884104
1 parent 7f46937
commit 1884104
Show file tree

Hide file tree

Showing 9 changed files with 177 additions and 259 deletions.
diff --git a/include/iorthoview.h b/include/iorthoview.h
@@ -7,7 +7,7 @@ template<typename Element>
 class BasicVector3;
 typedef BasicVector3<double> Vector3;
 
-const char* const RKEY_HIGHER_ENTITY_PRIORITY = "user/ui/xyview/higherEntitySelectionPriority";
+constexpr const char* const RKEY_HIGHER_ENTITY_PRIORITY = "user/ui/xyview/higherEntitySelectionPriority";
 
 // Possible types of the orthogonal view window
 enum EViewType
@@ -77,9 +77,6 @@ class IXWndManager :
     // to redraw immediately instead of queueing the draw.
 	virtual void updateAllViews(bool force = false) = 0;
 
-	// Free all allocated views
-	virtual void destroyViews() = 0;
-
 	// Sets the origin of all available views
 	virtual void setOrigin(const Vector3& origin) = 0;
 
@@ -113,7 +110,7 @@ class IXWndManager :
 
 } // namespace
 
-const char* const MODULE_ORTHOVIEWMANAGER = "OrthoviewManager";
+constexpr const char* const MODULE_ORTHOVIEWMANAGER = "OrthoviewManager";
 
 // This is the accessor for the xy window manager module
 inline ui::IXWndManager& GlobalXYWndManager()

diff --git a/radiant/ui/mainframe/AuiLayout.cpp b/radiant/ui/mainframe/AuiLayout.cpp
@@ -152,7 +152,7 @@ void AuiLayout::convertFloatingPaneToPropertyTab(AuiFloatingFrame* floatingWindo
     }
 }
 
-void AuiLayout::handlePaneClosed(const wxAuiPaneInfo& pane)
+void AuiLayout::handlePaneClosed(wxAuiPaneInfo& pane)
 {
     // Store the position of this pane before closing
     savePaneLocation(pane);
@@ -272,9 +272,6 @@ void AuiLayout::activate()
 
 void AuiLayout::deactivate()
 {
-    // Delete all active views
-    GlobalXYWndManager().destroyViews();
-
     // Get a reference to the managed window, it might be cleared by UnInit()
     auto managedWindow = _auiMgr.GetManagedWindow();
 
@@ -507,7 +504,7 @@ void AuiLayout::toggleControl(const std::string& controlName)
     }
 }
 
-void AuiLayout::savePaneLocation(const wxAuiPaneInfo& pane)
+void AuiLayout::savePaneLocation(wxAuiPaneInfo& pane)
 {
     if (pane.IsFloating())
     {

diff --git a/radiant/ui/mainframe/AuiLayout.h b/radiant/ui/mainframe/AuiLayout.h
@@ -70,9 +70,9 @@ class AuiLayout
         const std::function<void(wxAuiPaneInfo&)>& setupPane);
 
     void onPaneClose(wxAuiManagerEvent& ev);
-    void handlePaneClosed(const wxAuiPaneInfo& paneInfo);
+    void handlePaneClosed(wxAuiPaneInfo& paneInfo);
 
-    void savePaneLocation(const wxAuiPaneInfo& paneInfo);
+    void savePaneLocation(wxAuiPaneInfo& paneInfo);
     void restorePaneLocation(wxAuiPaneInfo& paneInfo);
 
     bool paneNameExists(const std::string& name) const;

diff --git a/radiant/ui/mainframe/PropertyNotebook.cpp b/radiant/ui/mainframe/PropertyNotebook.cpp
@@ -42,6 +42,9 @@ PropertyNotebook::PropertyNotebook(wxWindow* parent, AuiLayout& owner) :
     );
 }
 
+PropertyNotebook::~PropertyNotebook()
+{}
+
 void PropertyNotebook::addControl(const std::string& controlName)
 {
     if (controlExists(controlName))

diff --git a/radiant/ui/mainframe/PropertyNotebook.h b/radiant/ui/mainframe/PropertyNotebook.h
@@ -40,6 +40,7 @@ class PropertyNotebook :
 
 public:
     PropertyNotebook(wxWindow* parent, AuiLayout& owner);
+    ~PropertyNotebook() override;
 
     void addControl(const std::string& controlName);
     void focusControl(const std::string& controlName);