fix for wxGTK1 & bmpbuttn

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

diff --git a/include/wx/sizer.h b/include/wx/sizer.h
index 26a32ba3ea9faa6eda58a884f9d1f7b5cc95e912..0390c59605db52119dbed8b0657df78cc16ca72d 100644 (file)
--- a/include/wx/sizer.h
+++ b/include/wx/sizer.h
@@ -727,6 +727,8 @@ public:
     wxGridSizer( int rows, int cols, int vgap, int hgap );
     wxGridSizer( int cols, int vgap = 0, int hgap = 0 );
 
     wxGridSizer( int rows, int cols, int vgap, int hgap );
     wxGridSizer( int cols, int vgap = 0, int hgap = 0 );
 

+    virtual wxSizerItem *Insert(size_t index, wxSizerItem *item);
+

     virtual void RecalcSizes();
     virtual wxSize CalcMin();
 
     virtual void RecalcSizes();
     virtual wxSize CalcMin();
 


@@ -739,15 +741,16 @@ public:
     int GetVGap() const         { return m_vgap; }
     int GetHGap() const         { return m_hgap; }
 
     int GetVGap() const         { return m_vgap; }
     int GetHGap() const         { return m_hgap; }
 

+    // return the number of total items and the number of columns and rows
+    // (for internal use only)
+    int CalcRowsCols(int& rows, int& cols) const;
+

 protected:
     int    m_rows;
     int    m_cols;
     int    m_vgap;
     int    m_hgap;
 
 protected:
     int    m_rows;
     int    m_cols;
     int    m_vgap;
     int    m_hgap;
 

-    // return the number of total items and the number of columns and rows
-    int CalcRowsCols(int& rows, int& cols) const;
-

     void SetItemBounds( wxSizerItem *item, int x, int y, int w, int h );
 
 private:
     void SetItemBounds( wxSizerItem *item, int x, int y, int w, int h );
 
 private:


@@ -966,6 +969,10 @@ private:
 
 #endif // wxUSE_STATBOX
 
 
 #endif // wxUSE_STATBOX
 

+//---------------------------------------------------------------------------
+// wxStdDialogButtonSizer
+//---------------------------------------------------------------------------
+

 #if wxUSE_BUTTON
 
 class WXDLLIMPEXP_CORE wxStdDialogButtonSizer: public wxBoxSizer
 #if wxUSE_BUTTON
 
 class WXDLLIMPEXP_CORE wxStdDialogButtonSizer: public wxBoxSizer