Correct wxImage::Size() again; add unit tests for it.

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

diff --git a/include/wx/gbsizer.h b/include/wx/gbsizer.h
index 45812f8f22f800d3e6c458418c6cf4488ff9dc44..eaea7137b1b51bedfe12cfd073c30a794489b2d1 100644 (file)
--- a/include/wx/gbsizer.h
+++ b/include/wx/gbsizer.h
@@ -28,7 +28,7 @@
 // is used for this and also for wxGridCellCoords.
 //---------------------------------------------------------------------------
 
 // is used for this and also for wxGridCellCoords.
 //---------------------------------------------------------------------------
 

-class WXDLLEXPORT wxGBPosition
+class WXDLLIMPEXP_CORE wxGBPosition

 {
 public:
     wxGBPosition() : m_row(0), m_col(0) {}
 {
 public:
     wxGBPosition() : m_row(0), m_col(0) {}


@@ -50,7 +50,7 @@ private:
 };
 
 
 };
 
 

-class WXDLLEXPORT wxGBSpan
+class WXDLLIMPEXP_CORE wxGBSpan

 {
 public:
     wxGBSpan() : m_rowspan(1), m_colspan(1) {}
 {
 public:
     wxGBSpan() : m_rowspan(1), m_colspan(1) {}


@@ -72,7 +72,7 @@ private:
 };
 
 
 };
 
 

-extern WXDLLEXPORT_DATA(const wxGBSpan) wxDefaultSpan;
+extern WXDLLIMPEXP_DATA_CORE(const wxGBSpan) wxDefaultSpan;

 
 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------


@@ -82,7 +82,7 @@ extern WXDLLEXPORT_DATA(const wxGBSpan) wxDefaultSpan;
 class WXDLLIMPEXP_FWD_CORE wxGridBagSizer;
 
 
 class WXDLLIMPEXP_FWD_CORE wxGridBagSizer;
 
 

-class WXDLLEXPORT wxGBSizerItem : public wxSizerItem
+class WXDLLIMPEXP_CORE wxGBSizerItem : public wxSizerItem

 {
 public:
     // spacer
 {
 public:
     // spacer


@@ -156,7 +156,7 @@ protected:
 
 private:
     DECLARE_DYNAMIC_CLASS(wxGBSizerItem)
 
 private:
     DECLARE_DYNAMIC_CLASS(wxGBSizerItem)

-    DECLARE_NO_COPY_CLASS(wxGBSizerItem)
+    wxDECLARE_NO_COPY_CLASS(wxGBSizerItem);

 };
 
 
 };
 
 


@@ -165,7 +165,7 @@ private:
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 
 

-class WXDLLEXPORT wxGridBagSizer : public wxFlexGridSizer
+class WXDLLIMPEXP_CORE wxGridBagSizer : public wxFlexGridSizer

 {
 public:
     wxGridBagSizer(int vgap = 0, int hgap = 0 );
 {
 public:
     wxGridBagSizer(int vgap = 0, int hgap = 0 );


@@ -286,6 +286,7 @@ public:
 
 protected:
     wxGBPosition FindEmptyCell();
 
 protected:
     wxGBPosition FindEmptyCell();

+    void AdjustForOverflow();

 
     wxSize m_emptyCellSize;
 
 
     wxSize m_emptyCellSize;
 


@@ -293,7 +294,7 @@ protected:
 private:
 
     DECLARE_CLASS(wxGridBagSizer)
 private:
 
     DECLARE_CLASS(wxGridBagSizer)

-    DECLARE_NO_COPY_CLASS(wxGridBagSizer)
+    wxDECLARE_NO_COPY_CLASS(wxGridBagSizer);

 };
 
 //---------------------------------------------------------------------------
 };
 
 //---------------------------------------------------------------------------