Add some version checks to help compiling on OSX.

[wxWidgets.git] / src / common / sizer.cpp

diff --git a/src/common/sizer.cpp b/src/common/sizer.cpp
index 535cae56c5bbea3a2d8e23e4f90cd7573a61b5ff..9bc6fcc416cb72c3ea742914078d22e4fd3f82e4 100644 (file)
--- a/src/common/sizer.cpp
+++ b/src/common/sizer.cpp
@@ -840,6 +840,10 @@ bool wxSizer::Replace( size_t old, wxSizerItem *newitem )
 
     wxSizerItem *item = node->GetData();
     node->SetData(newitem);
 
     wxSizerItem *item = node->GetData();
     node->SetData(newitem);

+
+    if (item->IsWindow() && item->GetWindow())
+        item->GetWindow()->SetContainingSizer(NULL);
+

     delete item;
 
     return true;
     delete item;
 
     return true;


@@ -1319,6 +1323,7 @@ wxGridSizer::wxGridSizer( int cols, int vgap, int hgap )
       m_vgap( vgap ),
       m_hgap( hgap )
 {
       m_vgap( vgap ),
       m_hgap( hgap )
 {

+    wxASSERT(cols >= 0);

 }
 
 wxGridSizer::wxGridSizer( int cols, const wxSize& gap )
 }
 
 wxGridSizer::wxGridSizer( int cols, const wxSize& gap )


@@ -1327,6 +1332,7 @@ wxGridSizer::wxGridSizer( int cols, const wxSize& gap )
       m_vgap( gap.GetHeight() ),
       m_hgap( gap.GetWidth() )
 {
       m_vgap( gap.GetHeight() ),
       m_hgap( gap.GetWidth() )
 {

+    wxASSERT(cols >= 0);

 }
 
 wxGridSizer::wxGridSizer( int rows, int cols, int vgap, int hgap )
 }
 
 wxGridSizer::wxGridSizer( int rows, int cols, int vgap, int hgap )


@@ -1335,6 +1341,7 @@ wxGridSizer::wxGridSizer( int rows, int cols, int vgap, int hgap )
       m_vgap( vgap ),
       m_hgap( hgap )
 {
       m_vgap( vgap ),
       m_hgap( hgap )
 {

+    wxASSERT(rows >= 0 && cols >= 0);

 }
 
 wxGridSizer::wxGridSizer( int rows, int cols, const wxSize& gap )
 }
 
 wxGridSizer::wxGridSizer( int rows, int cols, const wxSize& gap )


@@ -1343,6 +1350,7 @@ wxGridSizer::wxGridSizer( int rows, int cols, const wxSize& gap )
       m_vgap( gap.GetHeight() ),
       m_hgap( gap.GetWidth() )
 {
       m_vgap( gap.GetHeight() ),
       m_hgap( gap.GetWidth() )
 {

+    wxASSERT(rows >= 0 && cols >= 0);

 }
 
 wxSizerItem *wxGridSizer::DoInsert(size_t index, wxSizerItem *item)
 }
 
 wxSizerItem *wxGridSizer::DoInsert(size_t index, wxSizerItem *item)


@@ -2085,7 +2093,7 @@ void wxBoxSizer::RecalcSizes()
 
     // Check for the degenerated case when we don't have enough space for even
     // the min sizes of all the items: in this case we really can't do much
 
     // Check for the degenerated case when we don't have enough space for even
     // the min sizes of all the items: in this case we really can't do much

-    // more than to to allocate the min size to as many of fixed size items as
+    // more than to allocate the min size to as many of fixed size items as

     // possible (on the assumption that variable size items such as text zones
     // or list boxes may use scrollbars to show their content even if their
     // size is less than min size but that fixed size items such as buttons
     // possible (on the assumption that variable size items such as text zones
     // or list boxes may use scrollbars to show their content even if their
     // size is less than min size but that fixed size items such as buttons


@@ -2389,6 +2397,9 @@ void wxStaticBoxSizer::RecalcSizes()
         // in the wxBoxSizer::RecalcSizes() call below using coordinates relative
         // to the top-left corner of the staticbox:
         m_position.x = m_position.y = 0;
         // in the wxBoxSizer::RecalcSizes() call below using coordinates relative
         // to the top-left corner of the staticbox:
         m_position.x = m_position.y = 0;

+#elif defined(__WXOSX__) && wxOSX_USE_COCOA
+        // the distance from the 'inner' content view to the embedded controls
+        m_position.x = m_position.y = 10;

 #else
         // if the wxStaticBox has childrens, then these windows must be placed
         // by the wxBoxSizer::RecalcSizes() call below using coordinates relative
 #else
         // if the wxStaticBox has childrens, then these windows must be placed
         // by the wxBoxSizer::RecalcSizes() call below using coordinates relative