no changes, just removed unnecessary GetStaticBoxBorders() function

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59434 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/sizer.cpp b/src/common/sizer.cpp
index f8d4d2ddf177dfb23d719058458605d952bccfda..ea3031200b690b49cb8da087e3f42ac97c1337c9 100644 (file)
--- a/src/common/sizer.cpp
+++ b/src/common/sizer.cpp
@@ -1341,10 +1341,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 )
     {
-        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
@@ -2146,19 +2151,10 @@ wxStaticBoxSizer::~wxStaticBoxSizer()
     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;
-    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 );
 
@@ -2178,7 +2174,7 @@ void wxStaticBoxSizer::RecalcSizes()
 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;