X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/16cba29d3a5a0a95b367382311a4a7a9a9833210..d8a7829312e4fa8e67950f68eafa5d507b4e9826:/include/wx/gbsizer.h?ds=sidebyside diff --git a/include/wx/gbsizer.h b/include/wx/gbsizer.h index b1667bcc3a..eaea7137b1 100644 --- a/include/wx/gbsizer.h +++ b/include/wx/gbsizer.h @@ -14,10 +14,6 @@ #ifndef __WXGBSIZER_H__ #define __WXGBSIZER_H__ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface "gbsizer.h" -#endif - #include "wx/sizer.h" @@ -32,7 +28,7 @@ // is used for this and also for wxGridCellCoords. //--------------------------------------------------------------------------- -class WXDLLEXPORT wxGBPosition +class WXDLLIMPEXP_CORE wxGBPosition { public: wxGBPosition() : m_row(0), m_col(0) {} @@ -54,7 +50,7 @@ private: }; -class WXDLLEXPORT wxGBSpan +class WXDLLIMPEXP_CORE wxGBSpan { public: wxGBSpan() : m_rowspan(1), m_colspan(1) {} @@ -76,17 +72,17 @@ private: }; -extern WXDLLEXPORT_DATA(const wxGBSpan) wxDefaultSpan; +extern WXDLLIMPEXP_DATA_CORE(const wxGBSpan) wxDefaultSpan; //--------------------------------------------------------------------------- // wxGBSizerItem //--------------------------------------------------------------------------- -class WXDLLEXPORT wxGridBagSizer; +class WXDLLIMPEXP_FWD_CORE wxGridBagSizer; -class WXDLLEXPORT wxGBSizerItem : public wxSizerItem +class WXDLLIMPEXP_CORE wxGBSizerItem : public wxSizerItem { public: // spacer @@ -160,7 +156,7 @@ protected: private: DECLARE_DYNAMIC_CLASS(wxGBSizerItem) - DECLARE_NO_COPY_CLASS(wxGBSizerItem) + wxDECLARE_NO_COPY_CLASS(wxGBSizerItem); }; @@ -169,7 +165,7 @@ private: //--------------------------------------------------------------------------- -class WXDLLEXPORT wxGridBagSizer : public wxFlexGridSizer +class WXDLLIMPEXP_CORE wxGridBagSizer : public wxFlexGridSizer { public: wxGridBagSizer(int vgap = 0, int hgap = 0 ); @@ -290,6 +286,7 @@ public: protected: wxGBPosition FindEmptyCell(); + void AdjustForOverflow(); wxSize m_emptyCellSize; @@ -297,7 +294,7 @@ protected: private: DECLARE_CLASS(wxGridBagSizer) - DECLARE_NO_COPY_CLASS(wxGridBagSizer) + wxDECLARE_NO_COPY_CLASS(wxGridBagSizer); }; //---------------------------------------------------------------------------