added and documented wxWindow::MoveBefore/AfterInTabOrder()

[wxWidgets.git] / include / wx / sizer.h

diff --git a/include/wx/sizer.h b/include/wx/sizer.h
index 804c618dbd8701a2ef5518421c40936e7ca7dac0..665a26b5dd3fea27907bf8c6c625e6517d9dab23 100644 (file)
--- a/include/wx/sizer.h
+++ b/include/wx/sizer.h
@@ -74,10 +74,11 @@ public:
 
     wxSize GetMinSize() const
         { return m_minSize; }
 
     wxSize GetMinSize() const
         { return m_minSize; }

+    wxSize GetMinSizeWithBorder() const;
+

     void SetMinSize(const wxSize& size)
         {
     void SetMinSize(const wxSize& size)
         {

-            if (IsWindow() && !(m_flag & wxFIXED_MINSIZE))
-                m_window->SetSizeHints(size);
+            if (IsWindow()) m_window->SetMinSize(size);

             m_minSize = size;            
         }
     void SetMinSize( int x, int y )
             m_minSize = size;            
         }
     void SetMinSize( int x, int y )


@@ -451,6 +452,9 @@ protected:
     int m_flexDirection;
     wxFlexSizerGrowMode m_growMode;
 
     int m_flexDirection;
     wxFlexSizerGrowMode m_growMode;
 

+    // saves CalcMin result to optimize RecalcSizes
+    wxSize m_calculatedMinSize;
+

 private:
     DECLARE_CLASS(wxFlexGridSizer)
     DECLARE_NO_COPY_CLASS(wxFlexGridSizer)
 private:
     DECLARE_CLASS(wxFlexGridSizer)
     DECLARE_NO_COPY_CLASS(wxFlexGridSizer)