doing WakeUp in osx_carbon differently for the main event as well

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

diff --git a/include/wx/gbsizer.h b/include/wx/gbsizer.h
index b0df2a9cc571ae2a4a6dfc9da3695850c4e543ca..f0012b7a44390fb38efc3139150d1e7310aa0e0b 100644 (file)
--- a/include/wx/gbsizer.h
+++ b/include/wx/gbsizer.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        gbsizer.h
+// Name:        wx/gbsizer.h

 // Purpose:     wxGridBagSizer:  A sizer that can lay out items in a grid,
 //              with items at specified cells, and with the option of row
 //              and/or column spanning
 // Purpose:     wxGridBagSizer:  A sizer that can lay out items in a grid,
 //              with items at specified cells, and with the option of row
 //              and/or column spanning


@@ -14,10 +14,6 @@
 #ifndef __WXGBSIZER_H__
 #define __WXGBSIZER_H__
 
 #ifndef __WXGBSIZER_H__
 #define __WXGBSIZER_H__
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "gbsizer.h"
-#endif
-

 #include "wx/sizer.h"
 
 
 #include "wx/sizer.h"
 
 


@@ -32,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) {}


@@ -54,39 +50,65 @@ private:
 };
 
 
 };
 
 

-class WXDLLEXPORT wxGBSpan
+class WXDLLIMPEXP_CORE wxGBSpan

 {
 public:
 {
 public:

-    wxGBSpan() : m_rowspan(1), m_colspan(1) {}
-    wxGBSpan(int rowspan, int colspan) : m_rowspan(rowspan), m_colspan(colspan) {}
+    wxGBSpan() { Init(); }
+    wxGBSpan(int rowspan, int colspan)
+    {
+        // Initialize the members to valid values as not doing it may result in
+        // infinite loop in wxGBSizer code if the user passed 0 for any of
+        // them, see #12934.
+        Init();
+
+        SetRowspan(rowspan);
+        SetColspan(colspan);
+    }

 
     // default copy ctor and assignment operator are okay.
 
     int GetRowspan() const { return m_rowspan; }
     int GetColspan() const { return m_colspan; }
 
     // default copy ctor and assignment operator are okay.
 
     int GetRowspan() const { return m_rowspan; }
     int GetColspan() const { return m_colspan; }

-    void SetRowspan(int rowspan) { m_rowspan = rowspan; }
-    void SetColspan(int colspan) { m_colspan = colspan; }
+    void SetRowspan(int rowspan)
+    {
+        wxCHECK_RET( rowspan > 0, "Row span should be strictly positive" );
+
+        m_rowspan = rowspan;
+    }
+
+    void SetColspan(int colspan)
+    {
+        wxCHECK_RET( colspan > 0, "Column span should be strictly positive" );
+
+        m_colspan = colspan;
+    }

 
     bool operator==(const wxGBSpan& o) const { return m_rowspan == o.m_rowspan && m_colspan == o.m_colspan; }
     bool operator!=(const wxGBSpan& o) const { return !(*this == o); }
 
 private:
 
     bool operator==(const wxGBSpan& o) const { return m_rowspan == o.m_rowspan && m_colspan == o.m_colspan; }
     bool operator!=(const wxGBSpan& o) const { return !(*this == o); }
 
 private:

+    void Init()
+    {
+        m_rowspan =
+        m_colspan = 1;
+    }
+

     int m_rowspan;
     int m_colspan;
 };
 
 
     int m_rowspan;
     int m_colspan;
 };
 
 

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

 
 
 //---------------------------------------------------------------------------
 // wxGBSizerItem
 //---------------------------------------------------------------------------
 
 
 
 //---------------------------------------------------------------------------
 // wxGBSizerItem
 //---------------------------------------------------------------------------
 

-class WXDLLEXPORT wxGridBagSizer;
+class WXDLLIMPEXP_FWD_CORE wxGridBagSizer;

 
 
 
 

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

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


@@ -138,7 +160,7 @@ public:
     // is successful and after the next Layout the item will be resized.
     bool SetSpan( const wxGBSpan& span );
 
     // is successful and after the next Layout the item will be resized.
     bool SetSpan( const wxGBSpan& span );
 

-    // Returns true if this item and the other item instersect
+    // Returns true if this item and the other item intersect

     bool Intersects(const wxGBSizerItem& other);
 
     // Returns true if the given pos/span would intersect with this item.
     bool Intersects(const wxGBSizerItem& other);
 
     // Returns true if the given pos/span would intersect with this item.


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

-    DECLARE_NO_COPY_CLASS(wxGBSizerItem)
+    wxDECLARE_NO_COPY_CLASS(wxGBSizerItem);

 };
 
 
 };
 
 


@@ -169,7 +191,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 );


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

+    void AdjustForOverflow();

 
     wxSize m_emptyCellSize;
 
 
     wxSize m_emptyCellSize;
 


@@ -297,7 +320,7 @@ protected:
 private:
 
     DECLARE_CLASS(wxGridBagSizer)
 private:
 
     DECLARE_CLASS(wxGridBagSizer)

-    DECLARE_NO_COPY_CLASS(wxGridBagSizer)
+    wxDECLARE_NO_COPY_CLASS(wxGridBagSizer);

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