Don't define wxArrayPGProperty as std::vector in STL build.

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

diff --git a/src/common/sizer.cpp b/src/common/sizer.cpp
index f8d4d2ddf177dfb23d719058458605d952bccfda..3d94c8bce844a12d93ed9b71649cfa25b1280b97 100644 (file)
--- a/src/common/sizer.cpp
+++ b/src/common/sizer.cpp
@@ -137,7 +137,7 @@ wxSizerItem::wxSizerItem()
 // window item
 void wxSizerItem::DoSetWindow(wxWindow *window)
 {
 // window item
 void wxSizerItem::DoSetWindow(wxWindow *window)
 {

-    wxCHECK_RET( window, _T("NULL window in wxSizerItem::SetWindow()") );
+    wxCHECK_RET( window, wxT("NULL window in wxSizerItem::SetWindow()") );

 
     m_kind = Item_Window;
     m_window = window;
 
     m_kind = Item_Window;
     m_window = window;


@@ -253,7 +253,7 @@ void wxSizerItem::Free()
 
         case Item_Max:
         default:
 
         case Item_Max:
         default:

-            wxFAIL_MSG( _T("unexpected wxSizerItem::m_kind") );
+            wxFAIL_MSG( wxT("unexpected wxSizerItem::m_kind") );

     }
 
     m_kind = Item_None;
     }
 
     m_kind = Item_None;


@@ -291,7 +291,7 @@ wxSize wxSizerItem::GetSize() const
 
         case Item_Max:
         default:
 
         case Item_Max:
         default:

-            wxFAIL_MSG( _T("unexpected wxSizerItem::m_kind") );
+            wxFAIL_MSG( wxT("unexpected wxSizerItem::m_kind") );

     }
 
     if (m_flag & wxWEST)
     }
 
     if (m_flag & wxWEST)


@@ -350,7 +350,7 @@ bool wxSizerItem::InformFirstDirection(int direction, int size, int availableOth
         {
             if( !wxIsNullDouble(m_ratio) )
             {
         {
             if( !wxIsNullDouble(m_ratio) )
             {

-                wxCHECK_MSG( (m_proportion==0), false, _T("Shaped item, non-zero proportion in wxSizerItem::InformFirstDirection()") );
+                wxCHECK_MSG( (m_proportion==0), false, wxT("Shaped item, non-zero proportion in wxSizerItem::InformFirstDirection()") );

                 if( direction==wxHORIZONTAL && !wxIsNullDouble(m_ratio) )
                 {
                     // Clip size so that we don't take too much
                 if( direction==wxHORIZONTAL && !wxIsNullDouble(m_ratio) )
                 {
                     // Clip size so that we don't take too much


@@ -476,7 +476,7 @@ void wxSizerItem::SetDimension( const wxPoint& pos_, const wxSize& size_ )
     switch ( m_kind )
     {
         case Item_None:
     switch ( m_kind )
     {
         case Item_None:

-            wxFAIL_MSG( _T("can't set size of uninitialized sizer item") );
+            wxFAIL_MSG( wxT("can't set size of uninitialized sizer item") );

             break;
 
         case Item_Window:
             break;
 
         case Item_Window:


@@ -505,7 +505,7 @@ void wxSizerItem::SetDimension( const wxPoint& pos_, const wxSize& size_ )
 
         case Item_Max:
         default:
 
         case Item_Max:
         default:

-            wxFAIL_MSG( _T("unexpected wxSizerItem::m_kind") );
+            wxFAIL_MSG( wxT("unexpected wxSizerItem::m_kind") );

     }
 }
 
     }
 }
 


@@ -534,7 +534,7 @@ void wxSizerItem::DeleteWindows()
 
         case Item_Max:
         default:
 
         case Item_Max:
         default:

-            wxFAIL_MSG( _T("unexpected wxSizerItem::m_kind") );
+            wxFAIL_MSG( wxT("unexpected wxSizerItem::m_kind") );

     }
 
 }
     }
 
 }


@@ -544,7 +544,7 @@ void wxSizerItem::Show( bool show )
     switch ( m_kind )
     {
         case Item_None:
     switch ( m_kind )
     {
         case Item_None:

-            wxFAIL_MSG( _T("can't show uninitialized sizer item") );
+            wxFAIL_MSG( wxT("can't show uninitialized sizer item") );

             break;
 
         case Item_Window:
             break;
 
         case Item_Window:


@@ -561,7 +561,7 @@ void wxSizerItem::Show( bool show )
 
         case Item_Max:
         default:
 
         case Item_Max:
         default:

-            wxFAIL_MSG( _T("unexpected wxSizerItem::m_kind") );
+            wxFAIL_MSG( wxT("unexpected wxSizerItem::m_kind") );

     }
 }
 
     }
 }
 


@@ -606,7 +606,7 @@ bool wxSizerItem::IsShown() const
 
         case Item_Max:
         default:
 
         case Item_Max:
         default:

-            wxFAIL_MSG( _T("unexpected wxSizerItem::m_kind") );
+            wxFAIL_MSG( wxT("unexpected wxSizerItem::m_kind") );

     }
 
     return false;
     }
 
     return false;


@@ -679,7 +679,7 @@ bool wxSizer::Remove( wxWindow *window )
 
 bool wxSizer::Remove( wxSizer *sizer )
 {
 
 bool wxSizer::Remove( wxSizer *sizer )
 {

-    wxASSERT_MSG( sizer, _T("Removing NULL sizer") );
+    wxASSERT_MSG( sizer, wxT("Removing NULL sizer") );

 
     wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
     while (node)
 
     wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
     while (node)


@@ -703,11 +703,11 @@ bool wxSizer::Remove( int index )
 {
     wxCHECK_MSG( index >= 0 && (size_t)index < m_children.GetCount(),
                  false,
 {
     wxCHECK_MSG( index >= 0 && (size_t)index < m_children.GetCount(),
                  false,

-                 _T("Remove index is out of range") );
+                 wxT("Remove index is out of range") );

 
     wxSizerItemList::compatibility_iterator node = m_children.Item( index );
 
 
     wxSizerItemList::compatibility_iterator node = m_children.Item( index );
 

-    wxCHECK_MSG( node, false, _T("Failed to find child node") );
+    wxCHECK_MSG( node, false, wxT("Failed to find child node") );

 
     delete node->GetData();
     m_children.Erase( node );
 
     delete node->GetData();
     m_children.Erase( node );


@@ -717,7 +717,7 @@ bool wxSizer::Remove( int index )
 
 bool wxSizer::Detach( wxSizer *sizer )
 {
 
 bool wxSizer::Detach( wxSizer *sizer )
 {

-    wxASSERT_MSG( sizer, _T("Detaching NULL sizer") );
+    wxASSERT_MSG( sizer, wxT("Detaching NULL sizer") );

 
     wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
     while (node)
 
     wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
     while (node)


@@ -739,7 +739,7 @@ bool wxSizer::Detach( wxSizer *sizer )
 
 bool wxSizer::Detach( wxWindow *window )
 {
 
 bool wxSizer::Detach( wxWindow *window )
 {

-    wxASSERT_MSG( window, _T("Detaching NULL window") );
+    wxASSERT_MSG( window, wxT("Detaching NULL window") );

 
     wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
     while (node)
 
     wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
     while (node)


@@ -762,11 +762,11 @@ bool wxSizer::Detach( int index )
 {
     wxCHECK_MSG( index >= 0 && (size_t)index < m_children.GetCount(),
                  false,
 {
     wxCHECK_MSG( index >= 0 && (size_t)index < m_children.GetCount(),
                  false,

-                 _T("Detach index is out of range") );
+                 wxT("Detach index is out of range") );

 
     wxSizerItemList::compatibility_iterator node = m_children.Item( index );
 
 
     wxSizerItemList::compatibility_iterator node = m_children.Item( index );
 

-    wxCHECK_MSG( node, false, _T("Failed to find child node") );
+    wxCHECK_MSG( node, false, wxT("Failed to find child node") );

 
     wxSizerItem *item = node->GetData();
 
 
     wxSizerItem *item = node->GetData();
 


@@ -780,8 +780,8 @@ bool wxSizer::Detach( int index )
 
 bool wxSizer::Replace( wxWindow *oldwin, wxWindow *newwin, bool recursive )
 {
 
 bool wxSizer::Replace( wxWindow *oldwin, wxWindow *newwin, bool recursive )
 {

-    wxASSERT_MSG( oldwin, _T("Replacing NULL window") );
-    wxASSERT_MSG( newwin, _T("Replacing with NULL window") );
+    wxASSERT_MSG( oldwin, wxT("Replacing NULL window") );
+    wxASSERT_MSG( newwin, wxT("Replacing with NULL window") );

 
     wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
     while (node)
 
     wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
     while (node)


@@ -808,8 +808,8 @@ bool wxSizer::Replace( wxWindow *oldwin, wxWindow *newwin, bool recursive )
 
 bool wxSizer::Replace( wxSizer *oldsz, wxSizer *newsz, bool recursive )
 {
 
 bool wxSizer::Replace( wxSizer *oldsz, wxSizer *newsz, bool recursive )
 {

-    wxASSERT_MSG( oldsz, _T("Replacing NULL sizer") );
-    wxASSERT_MSG( newsz, _T("Replacing with NULL sizer") );
+    wxASSERT_MSG( oldsz, wxT("Replacing NULL sizer") );
+    wxASSERT_MSG( newsz, wxT("Replacing with NULL sizer") );

 
     wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
     while (node)
 
     wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
     while (node)


@@ -835,12 +835,12 @@ bool wxSizer::Replace( wxSizer *oldsz, wxSizer *newsz, bool recursive )
 
 bool wxSizer::Replace( size_t old, wxSizerItem *newitem )
 {
 
 bool wxSizer::Replace( size_t old, wxSizerItem *newitem )
 {

-    wxCHECK_MSG( old < m_children.GetCount(), false, _T("Replace index is out of range") );
-    wxASSERT_MSG( newitem, _T("Replacing with NULL item") );
+    wxCHECK_MSG( old < m_children.GetCount(), false, wxT("Replace index is out of range") );
+    wxASSERT_MSG( newitem, wxT("Replacing with NULL item") );

 
     wxSizerItemList::compatibility_iterator node = m_children.Item( old );
 
 
     wxSizerItemList::compatibility_iterator node = m_children.Item( old );
 

-    wxCHECK_MSG( node, false, _T("Failed to find child node") );
+    wxCHECK_MSG( node, false, wxT("Failed to find child node") );

 
     wxSizerItem *item = node->GetData();
     node->SetData(newitem);
 
     wxSizerItem *item = node->GetData();
     node->SetData(newitem);


@@ -1032,7 +1032,7 @@ void wxSizer::DoSetMinSize( int width, int height )
 
 bool wxSizer::DoSetItemMinSize( wxWindow *window, int width, int height )
 {
 
 bool wxSizer::DoSetItemMinSize( wxWindow *window, int width, int height )
 {

-    wxASSERT_MSG( window, _T("SetMinSize for NULL window") );
+    wxASSERT_MSG( window, wxT("SetMinSize for NULL window") );

 
     // Is it our immediate child?
 
 
     // Is it our immediate child?
 


@@ -1070,7 +1070,7 @@ bool wxSizer::DoSetItemMinSize( wxWindow *window, int width, int height )
 
 bool wxSizer::DoSetItemMinSize( wxSizer *sizer, int width, int height )
 {
 
 bool wxSizer::DoSetItemMinSize( wxSizer *sizer, int width, int height )
 {

-    wxASSERT_MSG( sizer, _T("SetMinSize for NULL sizer") );
+    wxASSERT_MSG( sizer, wxT("SetMinSize for NULL sizer") );

 
     // Is it our immediate child?
 
 
     // Is it our immediate child?
 


@@ -1110,7 +1110,7 @@ bool wxSizer::DoSetItemMinSize( size_t index, int width, int height )
 {
     wxSizerItemList::compatibility_iterator node = m_children.Item( index );
 
 {
     wxSizerItemList::compatibility_iterator node = m_children.Item( index );
 

-    wxCHECK_MSG( node, false, _T("Failed to find child node") );
+    wxCHECK_MSG( node, false, wxT("Failed to find child node") );

 
     wxSizerItem     *item = node->GetData();
 
 
     wxSizerItem     *item = node->GetData();
 


@@ -1130,7 +1130,7 @@ bool wxSizer::DoSetItemMinSize( size_t index, int width, int height )
 
 wxSizerItem* wxSizer::GetItem( wxWindow *window, bool recursive )
 {
 
 wxSizerItem* wxSizer::GetItem( wxWindow *window, bool recursive )
 {

-    wxASSERT_MSG( window, _T("GetItem for NULL window") );
+    wxASSERT_MSG( window, wxT("GetItem for NULL window") );

 
     wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
     while (node)
 
     wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
     while (node)


@@ -1156,7 +1156,7 @@ wxSizerItem* wxSizer::GetItem( wxWindow *window, bool recursive )
 
 wxSizerItem* wxSizer::GetItem( wxSizer *sizer, bool recursive )
 {
 
 wxSizerItem* wxSizer::GetItem( wxSizer *sizer, bool recursive )
 {

-    wxASSERT_MSG( sizer, _T("GetItem for NULL sizer") );
+    wxASSERT_MSG( sizer, wxT("GetItem for NULL sizer") );

 
     wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
     while (node)
 
     wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
     while (node)


@@ -1184,7 +1184,7 @@ wxSizerItem* wxSizer::GetItem( size_t index )
 {
     wxCHECK_MSG( index < m_children.GetCount(),
                  NULL,
 {
     wxCHECK_MSG( index < m_children.GetCount(),
                  NULL,

-                 _T("GetItem index is out of range") );
+                 wxT("GetItem index is out of range") );

 
     return m_children.Item( index )->GetData();
 }
 
     return m_children.Item( index )->GetData();
 }


@@ -1279,7 +1279,7 @@ bool wxSizer::IsShown( wxWindow *window ) const
         node = node->GetNext();
     }
 
         node = node->GetNext();
     }
 

-    wxFAIL_MSG( _T("IsShown failed to find sizer item") );
+    wxFAIL_MSG( wxT("IsShown failed to find sizer item") );

 
     return false;
 }
 
     return false;
 }


@@ -1298,7 +1298,7 @@ bool wxSizer::IsShown( wxSizer *sizer ) const
         node = node->GetNext();
     }
 
         node = node->GetNext();
     }
 

-    wxFAIL_MSG( _T("IsShown failed to find sizer item") );
+    wxFAIL_MSG( wxT("IsShown failed to find sizer item") );

 
     return false;
 }
 
     return false;
 }


@@ -1307,7 +1307,7 @@ bool wxSizer::IsShown( size_t index ) const
 {
     wxCHECK_MSG( index < m_children.GetCount(),
                  false,
 {
     wxCHECK_MSG( index < m_children.GetCount(),
                  false,

-                 _T("IsShown index is out of range") );
+                 wxT("IsShown index is out of range") );

 
     return m_children.Item( index )->GetData()->IsShown();
 }
 
     return m_children.Item( index )->GetData()->IsShown();
 }


@@ -1317,19 +1317,35 @@ bool wxSizer::IsShown( size_t index ) const
 // wxGridSizer
 //---------------------------------------------------------------------------
 
 // wxGridSizer
 //---------------------------------------------------------------------------
 

+wxGridSizer::wxGridSizer( int cols, int vgap, int hgap )
+    : m_rows( cols == 0 ? 1 : 0 ),
+      m_cols( cols ),
+      m_vgap( vgap ),
+      m_hgap( hgap )
+{
+}
+
+wxGridSizer::wxGridSizer( int cols, const wxSize& gap )
+    : m_rows( cols == 0 ? 1 : 0 ),
+      m_cols( cols ),
+      m_vgap( gap.GetHeight() ),
+      m_hgap( gap.GetWidth() )
+{
+}
+

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

-    : m_rows( ( cols == 0 && rows == 0 ) ? 1 : rows )
-    , m_cols( cols )
-    , m_vgap( vgap )
-    , m_hgap( hgap )
+    : m_rows( rows || cols ? rows : 1 ),
+      m_cols( cols ),
+      m_vgap( vgap ),
+      m_hgap( hgap )

 {
 }
 
 {
 }
 

-wxGridSizer::wxGridSizer( int cols, int vgap, int hgap )
-    : m_rows( cols == 0 ? 1 : 0 )
-    , m_cols( cols )
-    , m_vgap( vgap )
-    , m_hgap( hgap )
+wxGridSizer::wxGridSizer( int rows, int cols, const wxSize& gap )
+    : m_rows( rows || cols ? rows : 1 ),
+      m_cols( cols ),
+      m_vgap( gap.GetHeight() ),
+      m_hgap( gap.GetWidth() )

 {
 }
 
 {
 }
 


@@ -1341,10 +1357,15 @@ wxSizerItem *wxGridSizer::Insert(size_t index, wxSizerItem *item)
     // this here to ensure that we detect errors as soon as possible
     if ( m_cols && m_rows )
     {
     // this here to ensure that we detect errors as soon as possible
     if ( m_cols && m_rows )
     {

-        if ( m_children.GetCount() == m_cols*m_rows )
+        const int nitems = m_children.GetCount();
+        if ( nitems == m_cols*m_rows )

         {
         {

-            wxFAIL_MSG( "too many items in grid sizer (maybe you should omit "
-                        "the number of either rows or columns?)" );
+            wxFAIL_MSG(
+                wxString::Format(
+                    "too many items (%d > %d*%d) in grid sizer (maybe you "
+                    "should omit the number of either rows or columns?)",
+                nitems + 1, m_cols, m_rows)
+            );

 
             // additionally, continuing to use the specified number of columns
             // and rows is not a good idea as callers of CalcRowsCols() expect
 
             // additionally, continuing to use the specified number of columns
             // and rows is not a good idea as callers of CalcRowsCols() expect


@@ -1385,7 +1406,7 @@ int wxGridSizer::CalcRowsCols(int& nrows, int& ncols) const
     }
     else // 0 columns, 0 rows?
     {
     }
     else // 0 columns, 0 rows?
     {

-        wxFAIL_MSG( _T("grid sizer must have either rows or columns fixed") );
+        wxFAIL_MSG( wxT("grid sizer must have either rows or columns fixed") );

 
         nrows =
         ncols = 0;
 
         nrows =
         ncols = 0;


@@ -1417,7 +1438,7 @@ void wxGridSizer::RecalcSizes()
             {
                 wxSizerItemList::compatibility_iterator node = m_children.Item( i );
 
             {
                 wxSizerItemList::compatibility_iterator node = m_children.Item( i );
 

-                wxASSERT_MSG( node, _T("Failed to find SizerItemList node") );
+                wxASSERT_MSG( node, wxT("Failed to find SizerItemList node") );

 
                 SetItemBounds( node->GetData(), x, y, w, h);
             }
 
                 SetItemBounds( node->GetData(), x, y, w, h);
             }


@@ -1520,6 +1541,20 @@ void wxGridSizer::SetItemBounds( wxSizerItem *item, int x, int y, int w, int h )
 // wxFlexGridSizer
 //---------------------------------------------------------------------------
 
 // wxFlexGridSizer
 //---------------------------------------------------------------------------
 

+wxFlexGridSizer::wxFlexGridSizer( int cols, int vgap, int hgap )
+               : wxGridSizer( cols, vgap, hgap ),
+                 m_flexDirection(wxBOTH),
+                 m_growMode(wxFLEX_GROWMODE_SPECIFIED)
+{
+}
+
+wxFlexGridSizer::wxFlexGridSizer( int cols, const wxSize& gap )
+               : wxGridSizer( cols, gap ),
+                 m_flexDirection(wxBOTH),
+                 m_growMode(wxFLEX_GROWMODE_SPECIFIED)
+{
+}
+

 wxFlexGridSizer::wxFlexGridSizer( int rows, int cols, int vgap, int hgap )
                : wxGridSizer( rows, cols, vgap, hgap ),
                  m_flexDirection(wxBOTH),
 wxFlexGridSizer::wxFlexGridSizer( int rows, int cols, int vgap, int hgap )
                : wxGridSizer( rows, cols, vgap, hgap ),
                  m_flexDirection(wxBOTH),


@@ -1527,8 +1562,8 @@ wxFlexGridSizer::wxFlexGridSizer( int rows, int cols, int vgap, int hgap )
 {
 }
 
 {
 }
 

-wxFlexGridSizer::wxFlexGridSizer( int cols, int vgap, int hgap )
-               : wxGridSizer( cols, vgap, hgap ),
+wxFlexGridSizer::wxFlexGridSizer( int rows, int cols, const wxSize& gap )
+               : wxGridSizer( rows, cols, gap ),

                  m_flexDirection(wxBOTH),
                  m_growMode(wxFLEX_GROWMODE_SPECIFIED)
 {
                  m_flexDirection(wxBOTH),
                  m_growMode(wxFLEX_GROWMODE_SPECIFIED)
 {


@@ -1808,7 +1843,7 @@ DoAdjustForGrowables(int delta,
 
 void wxFlexGridSizer::AdjustForGrowables(const wxSize& sz)
 {
 
 void wxFlexGridSizer::AdjustForGrowables(const wxSize& sz)
 {

-#ifdef __WXDEBUG__
+#if wxDEBUG_LEVEL

     // by the time this function is called, the sizer should be already fully
     // initialized and hence the number of its columns and rows is known and we
     // can check that all indices in m_growableCols/Rows are valid (see also
     // by the time this function is called, the sizer should be already fully
     // initialized and hence the number of its columns and rows is known and we
     // can check that all indices in m_growableCols/Rows are valid (see also


@@ -1836,7 +1871,7 @@ void wxFlexGridSizer::AdjustForGrowables(const wxSize& sz)
             }
         }
     }
             }
         }
     }

-#endif // __WXDEBUG__
+#endif // wxDEBUG_LEVEL

 
 
     if ( (m_flexDirection & wxHORIZONTAL) || (m_growMode != wxFLEX_GROWMODE_NONE) )
 
 
     if ( (m_flexDirection & wxHORIZONTAL) || (m_growMode != wxFLEX_GROWMODE_NONE) )


@@ -1954,7 +1989,7 @@ DoRemoveFromArrays(size_t idx, wxArrayInt& items, wxArrayInt& proportions)
         }
     }
 
         }
     }
 

-    wxFAIL_MSG( _T("column/row is already not growable") );
+    wxFAIL_MSG( wxT("column/row is already not growable") );

 }
 
 void wxFlexGridSizer::RemoveGrowableCol( size_t idx )
 }
 
 void wxFlexGridSizer::RemoveGrowableCol( size_t idx )


@@ -2146,29 +2181,44 @@ wxStaticBoxSizer::~wxStaticBoxSizer()
     delete m_staticBox;
 }
 
     delete m_staticBox;
 }
 

-static void GetStaticBoxBorders( wxStaticBox *box,
-                                 int *borderTop,
-                                 int *borderOther)
-{
-    // this has to be done platform by platform as there is no way to
-    // guess the thickness of a wxStaticBox border
-    box->GetBordersForSizer(borderTop, borderOther);
-}
-

 void wxStaticBoxSizer::RecalcSizes()
 {
     int top_border, other_border;
 void wxStaticBoxSizer::RecalcSizes()
 {
     int top_border, other_border;

-    GetStaticBoxBorders(m_staticBox, &top_border, &other_border);
+    m_staticBox->GetBordersForSizer(&top_border, &other_border);

 
     m_staticBox->SetSize( m_position.x, m_position.y, m_size.x, m_size.y );
 
 
     m_staticBox->SetSize( m_position.x, m_position.y, m_size.x, m_size.y );
 

-    wxPoint old_pos( m_position );
-    m_position.x += other_border;
-    m_position.y += top_border;

     wxSize old_size( m_size );
     m_size.x -= 2*other_border;
     m_size.y -= top_border + other_border;
 
     wxSize old_size( m_size );
     m_size.x -= 2*other_border;
     m_size.y -= top_border + other_border;
 

+    wxPoint old_pos( m_position );
+    if (m_staticBox->GetChildren().GetCount() > 0)
+    {
+#if defined( __WXGTK20__ )
+        // if the wxStaticBox has created a wxPizza to contain its children
+        // (see wxStaticBox::AddChild) then we need to place the items it contains
+        // in the wxBoxSizer::RecalcSizes() call below using coordinates relative 
+        // to the top-left corner of the staticbox:
+        m_position.x = m_position.y = 0;
+#else
+        // if the wxStaticBox has childrens, then these windows must be placed
+        // by the wxBoxSizer::RecalcSizes() call below using coordinates relative 
+        // to the top-left corner of the staticbox (but unlike wxGTK, we need
+        // to keep in count the static borders here!):
+        m_position.x = other_border;
+        m_position.y = top_border;
+#endif
+    }
+    else
+    {
+        // the windows contained in the staticbox have been created as siblings of the
+        // staticbox (this is the "old" way of staticbox contents creation); in this
+        // case we need to position them with coordinates relative to our common parent
+        m_position.x += other_border;
+        m_position.y += top_border;
+    }
+

     wxBoxSizer::RecalcSizes();
 
     m_position = old_pos;
     wxBoxSizer::RecalcSizes();
 
     m_position = old_pos;


@@ -2178,10 +2228,17 @@ void wxStaticBoxSizer::RecalcSizes()
 wxSize wxStaticBoxSizer::CalcMin()
 {
     int top_border, other_border;
 wxSize wxStaticBoxSizer::CalcMin()
 {
     int top_border, other_border;

-    GetStaticBoxBorders(m_staticBox, &top_border, &other_border);
+    m_staticBox->GetBordersForSizer(&top_border, &other_border);

 
     wxSize ret( wxBoxSizer::CalcMin() );
     ret.x += 2*other_border;
 
     wxSize ret( wxBoxSizer::CalcMin() );
     ret.x += 2*other_border;

+
+    // ensure that we're wide enough to show the static box label (there is no
+    // need to check for the static box best size in vertical direction though)
+    const int boxWidth = m_staticBox->GetBestSize().x;
+    if ( ret.x < boxWidth )
+        ret.x = boxWidth;
+

     ret.y += other_border + top_border;
 
     return ret;
     ret.y += other_border + top_border;
 
     return ret;


@@ -2209,6 +2266,10 @@ bool wxStaticBoxSizer::Detach( wxWindow *window )
 
 #endif // wxUSE_STATBOX
 
 
 #endif // wxUSE_STATBOX
 

+//---------------------------------------------------------------------------
+// wxStdDialogButtonSizer
+//---------------------------------------------------------------------------
+

 #if wxUSE_BUTTON
 
 wxStdDialogButtonSizer::wxStdDialogButtonSizer()
 #if wxUSE_BUTTON
 
 wxStdDialogButtonSizer::wxStdDialogButtonSizer()