use window's font instead of the default one in wxStatusBar

[wxWidgets.git] / src / generic / collpaneg.cpp

diff --git a/src/generic/collpaneg.cpp b/src/generic/collpaneg.cpp
index 4a91de602deae116aefec85e4e85416c60dc09ad..8985914aa10b1c565799a776379d52ef93f3332e 100644 (file)
--- a/src/generic/collpaneg.cpp
+++ b/src/generic/collpaneg.cpp
@@ -17,12 +17,14 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

+#include "wx/collpane.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

+    #include "wx/toplevel.h"

     #include "wx/button.h"
     #include "wx/sizer.h"
 #endif // !WX_PRECOMP
 
     #include "wx/button.h"
     #include "wx/sizer.h"
 #endif // !WX_PRECOMP
 

-#include "wx/collpane.h"

 #include "wx/statline.h"
 
 // ----------------------------------------------------------------------------
 #include "wx/statline.h"
 
 // ----------------------------------------------------------------------------


@@ -109,8 +111,9 @@ void wxGenericCollapsiblePane::OnStateChange(const wxSize& sz)
     SetMinSize(sz);
     SetSize(sz);
 
     SetMinSize(sz);
     SetSize(sz);
 

-    wxWindow *top = wxGetTopLevelParent(this);
-    if (top)
+    wxTopLevelWindow *
+        top = wxDynamicCast(wxGetTopLevelParent(this), wxTopLevelWindow);
+    if ( top )

     {
         // we've changed our size, thus our top level parent needs to relayout
         // itself
     {
         // we've changed our size, thus our top level parent needs to relayout
         // itself


@@ -131,17 +134,22 @@ void wxGenericCollapsiblePane::OnStateChange(const wxSize& sz)
 #endif
             top->GetSizer()->SetSizeHints(top);
 
 #endif
             top->GetSizer()->SetSizeHints(top);
 

-        if (IsCollapsed())
-        {
-            // use SetClientSize() and not SetSize() otherwise the size for
-            // e.g. a wxFrame with a menubar wouldn't be correctly set
-            top->SetClientSize(sz);
-        }
-        else
+
+        // we shouldn't attempt to resize a maximized window, whatever happens
+        if ( !top->IsMaximized() )

         {
         {

-            // force our parent to "fit", i.e. expand so that it can honour
-            // our minimal size
-            top->Fit();
+            if ( IsCollapsed() )
+            {
+                // use SetClientSize() and not SetSize() otherwise the size for
+                // e.g. a wxFrame with a menubar wouldn't be correctly set
+                top->SetClientSize(sz);
+            }
+            else
+            {
+                // force our parent to "fit", i.e. expand so that it can honour
+                // our minimal size
+                top->Fit();
+            }

         }
     }
 }
         }
     }
 }