X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/13a3888794c97e06686a9f40189d63f708e891ba..f239a20092359e3c914adb79bd39f3f5d2b2e06f:/src/common/wrapsizer.cpp

diff --git a/src/common/wrapsizer.cpp b/src/common/wrapsizer.cpp
index 91a43c2ea5..ff7b0310ec 100644
--- a/src/common/wrapsizer.cpp
+++ b/src/common/wrapsizer.cpp
@@ -59,7 +59,7 @@ private:
     wxSizerItem& m_item;
     const int m_propOld;
 
-    DECLARE_NO_COPY_CLASS(wxPropChanger)
+    wxDECLARE_NO_COPY_CLASS(wxPropChanger);
 };
 
 } // anonymous namespace
@@ -68,7 +68,7 @@ private:
 // wxWrapSizer implementation
 // ============================================================================
 
-IMPLEMENT_DYNAMIC_CLASS(wxWrapSizer, wxBoxSizer);
+IMPLEMENT_DYNAMIC_CLASS(wxWrapSizer, wxBoxSizer)
 
 wxWrapSizer::wxWrapSizer(int orient, int flags)
            : wxBoxSizer(orient),
@@ -112,7 +112,7 @@ void wxWrapSizer::ClearRows()
         row->GetChildren().clear();
 
         wxPropChanger * const
-            propChanger = wx_static_cast(wxPropChanger *, item->GetUserData());
+            propChanger = static_cast<wxPropChanger *>(item->GetUserData());
         if ( propChanger )
         {
             // this deletes propChanger and so restores the old proportion
@@ -425,7 +425,7 @@ void wxWrapSizer::CalcMinFromMinor(int totMinor)
             wxSizerItem *item = node->GetData();
             if ( item->IsShown() )
             {
-                sz = item->GetMinSize();
+                sz = item->GetMinSizeWithBorder();
                 if ( line->m_width+SizeInMajorDir(sz)>lineSize )
                 {
                     line = new wxWrapLine;
@@ -458,7 +458,7 @@ void wxWrapSizer::CalcMinFromMinor(int totMinor)
                 // Take what is not used on this line, see how much extension we get
                 // by adding first item on next line.
                 int size = lineSize-lines[ix]->m_width; // Left over at end of this line
-                int extSize = GetSizeInMajorDir(lines[ix+1]->m_first->GetMinSize()) - size;
+                int extSize = GetSizeInMajorDir(lines[ix+1]->m_first->GetMinSizeWithBorder()) - size;
                 if ( (extSize>=tailSize && (extSize<bestExtSize || bestExtSize<tailSize)) ||
                     (extSize>bestExtSize && bestExtSize<tailSize) )
                     bestExtSize = extSize;
@@ -527,7 +527,7 @@ void wxWrapSizer::RecalcSizes()
         if ( !item->IsShown() )
             continue;
 
-        wxSize minItemSize = item->GetMinSize();
+        wxSize minItemSize = item->GetMinSizeWithBorder();
         const int itemMajor = SizeInMajorDir(minItemSize);
         const int itemMinor = SizeInMinorDir(minItemSize);
         if ( itemMajor > 0 && itemMajor < m_minItemMajor )