X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/eb2a7883df16d45e476efd12d601b56e0ef1429f..4fab71288ea3629e48fe100b337d9465266ef149:/include/wx/sizer.h

diff --git a/include/wx/sizer.h b/include/wx/sizer.h
index ce907346bb..ade5aea748 100644
--- a/include/wx/sizer.h
+++ b/include/wx/sizer.h
@@ -26,9 +26,9 @@
 // classes
 //---------------------------------------------------------------------------
 
-class wxSizerItem;
-class wxSizer;
-class wxBoxSizer;
+class WXDLLEXPORT wxSizerItem;
+class WXDLLEXPORT wxSizer;
+class WXDLLEXPORT wxBoxSizer;
 
 //---------------------------------------------------------------------------
 // wxSizerItem
@@ -74,10 +74,11 @@ public:
 
     wxSize GetMinSize() const
         { return m_minSize; }
+    wxSize GetMinSizeWithBorder() const;
+
     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 )
@@ -197,6 +198,9 @@ public:
                       wxObject* userData = NULL );
     virtual void Add( wxSizerItem *item );
 
+    virtual void AddSpacer(int size);
+    virtual void AddStretchSpacer(int prop = 1);
+
     virtual void Insert( size_t index,
                          wxWindow *window,
                          int proportion = 0,
@@ -219,6 +223,9 @@ public:
     virtual void Insert( size_t index,
                          wxSizerItem *item );
 
+    virtual void InsertSpacer(size_t index, int size);
+    virtual void InsertStretchSpacer(size_t index, int prop = 1);
+
     virtual void Prepend( wxWindow *window,
                           int proportion = 0,
                           int flag = 0,
@@ -237,6 +244,9 @@ public:
                           wxObject* userData = NULL );
     virtual void Prepend( wxSizerItem *item );
 
+    virtual void PrependSpacer(int size);
+    virtual void PrependStretchSpacer(int prop = 1);
+
     // Deprecated in 2.6 since historically it does not delete the window,
     // use Detach instead.
     wxDEPRECATED( virtual bool Remove( wxWindow *window ) );
@@ -451,6 +461,9 @@ protected:
     int m_flexDirection;
     wxFlexSizerGrowMode m_growMode;
 
+    // saves CalcMin result to optimize RecalcSizes
+    wxSize m_calculatedMinSize;
+
 private:
     DECLARE_CLASS(wxFlexGridSizer)
     DECLARE_NO_COPY_CLASS(wxFlexGridSizer)
@@ -518,6 +531,11 @@ private:
 
 #endif // wxUSE_STATBOX
 
+
+#if WXWIN_COMPATIBILITY_2_4
+// NB: wxBookCtrlSizer and wxNotebookSizer are deprecated, they
+//     don't do anything. wxBookCtrl::DoGetBestSize does the job now.
+
 // ----------------------------------------------------------------------------
 // wxBookCtrlSizer
 // ----------------------------------------------------------------------------
@@ -531,14 +549,18 @@ class WXDLLEXPORT wxBookCtrl;
 class WXDLLEXPORT wxBookCtrlSizer : public wxSizer
 {
 public:
-    wxBookCtrlSizer(wxBookCtrl *bookctrl);
+    wxDEPRECATED( wxBookCtrlSizer(wxBookCtrl *bookctrl) );
 
+    wxBookCtrl *GetControl() const { return m_bookctrl; }
+    
     virtual void RecalcSizes();
     virtual wxSize CalcMin();
 
-    wxBookCtrl *GetControl() const { return m_bookctrl; }
-
 protected:
+    // this protected ctor lets us mark the real one above as deprecated
+    // and still have warning-free build of the library itself:
+    wxBookCtrlSizer() {}
+    
     wxBookCtrl *m_bookctrl;
 
 private:
@@ -556,7 +578,7 @@ class WXDLLEXPORT wxNotebook;
 class WXDLLEXPORT wxNotebookSizer : public wxBookCtrlSizer
 {
 public:
-    wxNotebookSizer(wxNotebook *nb);
+    wxDEPRECATED( wxNotebookSizer(wxNotebook *nb) );
 
     wxNotebook *GetNotebook() const { return (wxNotebook *)m_bookctrl; }
 
@@ -569,5 +591,8 @@ private:
 
 #endif // wxUSE_BOOKCTRL
 
+#endif // WXWIN_COMPATIBILITY_2_4
+
+
 #endif // __WXSIZER_H__