Source cleaning.

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

diff --git a/include/wx/sizer.h b/include/wx/sizer.h
index 5f7738dce2dd378ccdb8dbb4da430e2f8b937eac..ade5aea7480eee617098acabd81141c769a18842 100644 (file)
--- a/include/wx/sizer.h
+++ b/include/wx/sizer.h
@@ -26,9 +26,9 @@
 // classes
 //---------------------------------------------------------------------------
 
 // classes
 //---------------------------------------------------------------------------
 

-class wxSizerItem;
-class wxSizer;
-class wxBoxSizer;
+class WXDLLEXPORT wxSizerItem;
+class WXDLLEXPORT wxSizer;
+class WXDLLEXPORT wxBoxSizer;

 
 //---------------------------------------------------------------------------
 // wxSizerItem
 
 //---------------------------------------------------------------------------
 // wxSizerItem


@@ -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 )


@@ -197,6 +198,9 @@ public:
                       wxObject* userData = NULL );
     virtual void Add( wxSizerItem *item );
 
                       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,
     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 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,
     virtual void Prepend( wxWindow *window,
                           int proportion = 0,
                           int flag = 0,


@@ -237,6 +244,9 @@ public:
                           wxObject* userData = NULL );
     virtual void Prepend( wxSizerItem *item );
 
                           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 ) );
     // Deprecated in 2.6 since historically it does not delete the window,
     // use Detach instead.
     wxDEPRECATED( virtual bool Remove( wxWindow *window ) );


@@ -313,7 +323,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;


@@ -451,6 +461,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)


@@ -505,6 +518,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;
 


@@ -515,6 +531,11 @@ private:
 
 #endif // wxUSE_STATBOX
 
 
 #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
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxBookCtrlSizer
 // ----------------------------------------------------------------------------


@@ -528,14 +549,18 @@ class WXDLLEXPORT wxBookCtrl;
 class WXDLLEXPORT wxBookCtrlSizer : public wxSizer
 {
 public:
 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();
 
     virtual void RecalcSizes();
     virtual wxSize CalcMin();
 

-    wxBookCtrl *GetControl() const { return m_bookctrl; }
-

 protected:
 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:
     wxBookCtrl *m_bookctrl;
 
 private:


@@ -553,7 +578,7 @@ class WXDLLEXPORT wxNotebook;
 class WXDLLEXPORT wxNotebookSizer : public wxBookCtrlSizer
 {
 public:
 class WXDLLEXPORT wxNotebookSizer : public wxBookCtrlSizer
 {
 public:

-    wxNotebookSizer(wxNotebook *nb);
+    wxDEPRECATED( wxNotebookSizer(wxNotebook *nb) );

 
     wxNotebook *GetNotebook() const { return (wxNotebook *)m_bookctrl; }
 
 
     wxNotebook *GetNotebook() const { return (wxNotebook *)m_bookctrl; }
 


@@ -566,5 +591,8 @@ private:
 
 #endif // wxUSE_BOOKCTRL
 
 
 #endif // wxUSE_BOOKCTRL
 

+#endif // WXWIN_COMPATIBILITY_2_4
+
+

 #endif // __WXSIZER_H__
 
 #endif // __WXSIZER_H__