show/hide static box when the wxStaticBoxSizer is shown/hidden (replaces patch 897020)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26817 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/sizer.h b/include/wx/sizer.h
index 5f7738dce2dd378ccdb8dbb4da430e2f8b937eac..ce907346bba9fdbd62b39d0547b6f66c884e4e30 100644 (file)
--- a/include/wx/sizer.h
+++ b/include/wx/sizer.h
@@ -313,7 +313,7 @@ public:
     bool IsShown( size_t index ) const;
 
     // Recursively call wxWindow::Show () on all sizer items.
     bool IsShown( size_t index ) const;
 
     // Recursively call wxWindow::Show () on all sizer items.

-    void ShowItems (bool show);
+    virtual void ShowItems (bool show);

 
 protected:
     wxSize              m_size;
 
 protected:
     wxSize              m_size;


@@ -505,6 +505,9 @@ public:
     wxStaticBox *GetStaticBox() const
         { return m_staticBox; }
 
     wxStaticBox *GetStaticBox() const
         { return m_staticBox; }
 

+    // override to hide/show the static box as well
+    virtual void ShowItems (bool show);
+

 protected:
     wxStaticBox   *m_staticBox;
 
 protected:
     wxStaticBox   *m_staticBox;
 

diff --git a/src/common/sizer.cpp b/src/common/sizer.cpp
index 2fd2d9f854c3a31db97e562e5de4d2ed40fe150b..1d9073891ff707dcd7ba0326e884f4417c5801d2 100644 (file)
--- a/src/common/sizer.cpp
+++ b/src/common/sizer.cpp
@@ -1624,6 +1624,12 @@ wxSize wxStaticBoxSizer::CalcMin()
     return ret;
 }
 
     return ret;
 }
 

+void wxStaticBoxSizer::ShowItems( bool show )
+{
+    m_staticBox->Show( show );
+    wxBoxSizer::ShowItems( show );
+}
+

 #endif // wxUSE_STATBOX
 
 // ----------------------------------------------------------------------------
 #endif // wxUSE_STATBOX
 
 // ----------------------------------------------------------------------------