HAVE_XIM is disabled in GTK2 build, don't include useless member variables

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

diff --git a/include/wx/sizer.h b/include/wx/sizer.h
index 76687aed61dde6c18db52cb517895589f787b792..f1dbcdf4656b8b72b0ed8f51b83273abdf640640 100644 (file)
--- 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
@@ -59,7 +59,8 @@ public:
                  int border,
                  wxObject* userData );
 
-    ~wxSizerItem();
+    wxSizerItem();
+    virtual ~wxSizerItem();
 
     virtual void DeleteWindows();
 
@@ -73,8 +74,17 @@ public:
 
     wxSize GetMinSize() const
         { return m_minSize; }
+    wxSize GetMinSizeWithBorder() const;
+
+    void SetMinSize(const wxSize& size)
+        {
+            if (IsWindow()) m_window->SetMinSize(size);
+            m_minSize = size;            
+        }
+    void SetMinSize( int x, int y )
+        { SetMinSize(wxSize(x, y)); }    
     void SetInitSize( int x, int y )
-        { m_minSize.x = x; m_minSize.y = y; }
+        { SetMinSize(wxSize(x, y)); }
 
     void SetRatio( int width, int height )
         // if either of dimensions is zero, ratio is assumed to be 1
@@ -111,7 +121,7 @@ public:
     wxWindow *GetWindow() const
         { return m_window; }
     void SetWindow( wxWindow *window )
-        { m_window = window; }
+        { m_window = window; m_minSize = window->GetSize(); }
     wxSizer *GetSizer() const
         { return m_sizer; }
     void SetSizer( wxSizer *sizer )
@@ -304,7 +314,7 @@ public:
     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;
@@ -412,12 +422,19 @@ public:
     void SetNonFlexibleGrowMode(wxFlexSizerGrowMode mode) { m_growMode = mode; }
     wxFlexSizerGrowMode GetNonFlexibleGrowMode() const { return m_growMode; }
 
-
+    // Read-only access to the row heights and col widths arrays
+    const wxArrayInt& GetRowHeights() const { return m_rowHeights; }
+    const wxArrayInt& GetColWidths() const  { return m_colWidths; }
+    
     // implementation
     virtual void RecalcSizes();
     virtual wxSize CalcMin();
 
 protected:
+    void AdjustForFlexDirection();
+    void AdjustForGrowables(const wxSize& sz, const wxSize& minsz,
+                            int nrows, int ncols);
+    
     // the heights/widths of all rows/columns
     wxArrayInt  m_rowHeights,
                 m_colWidths;
@@ -435,6 +452,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)
@@ -489,6 +509,9 @@ public:
     wxStaticBox *GetStaticBox() const
         { return m_staticBox; }
 
+    // override to hide/show the static box as well
+    virtual void ShowItems (bool show);
+
 protected:
     wxStaticBox   *m_staticBox;
 
@@ -499,6 +522,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
 // ----------------------------------------------------------------------------
@@ -512,14 +540,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 has warning-free build of the library itself:
+    wxBookCtrlSizer() {}
+    
     wxBookCtrl *m_bookctrl;
 
 private:
@@ -537,7 +569,7 @@ class WXDLLEXPORT wxNotebook;
 class WXDLLEXPORT wxNotebookSizer : public wxBookCtrlSizer
 {
 public:
-    wxNotebookSizer(wxNotebook *nb);
+    wxDEPRECATED( wxNotebookSizer(wxNotebook *nb) );
 
     wxNotebook *GetNotebook() const { return (wxNotebook *)m_bookctrl; }
 
@@ -550,5 +582,8 @@ private:
 
 #endif // wxUSE_BOOKCTRL
 
+#endif // WXWIN_COMPATIBILITY_2_4
+
+
 #endif // __WXSIZER_H__