X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/52ceb90e10fde0dc460ea1b200bd84fac1d1dd5c..b771d06bade79af05559648a0cb13c59dcc0f8a8:/include/wx/sizer.h diff --git a/include/wx/sizer.h b/include/wx/sizer.h index d65663d1db..7af1eccb16 100644 --- a/include/wx/sizer.h +++ b/include/wx/sizer.h @@ -471,7 +471,7 @@ protected: private: DECLARE_CLASS(wxSizerItem) - DECLARE_NO_COPY_CLASS(wxSizerItem) + wxDECLARE_NO_COPY_CLASS(wxSizerItem); }; WX_DECLARE_EXPORTED_LIST( wxSizerItem, wxSizerItemList ); @@ -727,6 +727,8 @@ public: 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(); @@ -739,15 +741,16 @@ public: 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; - // 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: @@ -838,7 +841,7 @@ protected: private: DECLARE_CLASS(wxFlexGridSizer) - DECLARE_NO_COPY_CLASS(wxFlexGridSizer) + wxDECLARE_NO_COPY_CLASS(wxFlexGridSizer); }; //--------------------------------------------------------------------------- @@ -961,7 +964,7 @@ protected: private: DECLARE_CLASS(wxStaticBoxSizer) - DECLARE_NO_COPY_CLASS(wxStaticBoxSizer) + wxDECLARE_NO_COPY_CLASS(wxStaticBoxSizer); }; #endif // wxUSE_STATBOX @@ -1009,7 +1012,7 @@ protected: private: DECLARE_CLASS(wxStdDialogButtonSizer) - DECLARE_NO_COPY_CLASS(wxStdDialogButtonSizer) + wxDECLARE_NO_COPY_CLASS(wxStdDialogButtonSizer); }; #endif // wxUSE_BUTTON