don't allow docks to be resized such that panes overlap

[wxWidgets.git] / src / common / sizer.cpp

diff --git a/src/common/sizer.cpp b/src/common/sizer.cpp
index ea3031200b690b49cb8da087e3f42ac97c1337c9..6e4fbcb376a7047e3740d76f80de54d197b4a94e 100644 (file)
--- a/src/common/sizer.cpp
+++ b/src/common/sizer.cpp
@@ -1813,7 +1813,7 @@ DoAdjustForGrowables(int delta,
 
 void wxFlexGridSizer::AdjustForGrowables(const wxSize& sz)
 {
 
 void wxFlexGridSizer::AdjustForGrowables(const wxSize& sz)
 {

-#ifdef __WXDEBUG__
+#if wxDEBUG_LEVEL

     // by the time this function is called, the sizer should be already fully
     // initialized and hence the number of its columns and rows is known and we
     // can check that all indices in m_growableCols/Rows are valid (see also
     // by the time this function is called, the sizer should be already fully
     // initialized and hence the number of its columns and rows is known and we
     // can check that all indices in m_growableCols/Rows are valid (see also


@@ -1841,7 +1841,7 @@ void wxFlexGridSizer::AdjustForGrowables(const wxSize& sz)
             }
         }
     }
             }
         }
     }

-#endif // __WXDEBUG__
+#endif // wxDEBUG_LEVEL

 
 
     if ( (m_flexDirection & wxHORIZONTAL) || (m_growMode != wxFLEX_GROWMODE_NONE) )
 
 
     if ( (m_flexDirection & wxHORIZONTAL) || (m_growMode != wxFLEX_GROWMODE_NONE) )


@@ -2178,6 +2178,13 @@ wxSize wxStaticBoxSizer::CalcMin()
 
     wxSize ret( wxBoxSizer::CalcMin() );
     ret.x += 2*other_border;
 
     wxSize ret( wxBoxSizer::CalcMin() );
     ret.x += 2*other_border;

+
+    // ensure that we're wide enough to show the static box label (there is no
+    // need to check for the static box best size in vertical direction though)
+    const int boxWidth = m_staticBox->GetBestSize().x;
+    if ( ret.x < boxWidth )
+        ret.x = boxWidth;
+

     ret.y += other_border + top_border;
 
     return ret;
     ret.y += other_border + top_border;
 
     return ret;