wxLocale now uses wxEncodingConverter (must be explicitly enabled)

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

diff --git a/src/common/sizer.cpp b/src/common/sizer.cpp
index f1e0c5dd4e351a0fec3ab4f441940ec91619fc20..6280097628142767b8f4ea6079b524470ae901ff 100644 (file)
--- a/src/common/sizer.cpp
+++ b/src/common/sizer.cpp
@@ -413,7 +413,7 @@ void wxBoxSizer::RecalcSizes()
 
        if (m_orient == wxVERTICAL)
        {
-           long height = size.y;
+           wxCoord height = size.y;
            if (item->GetOption())
            {
                height = (delta * weight) + extra;
@@ -438,7 +438,7 @@ void wxBoxSizer::RecalcSizes()
        }
        else
        {
-           long width = size.x;
+           wxCoord width = size.x;
            if (item->GetOption())
            {
                width = (delta * weight) + extra;
@@ -469,7 +469,7 @@ void wxBoxSizer::RecalcSizes()
 wxSize wxBoxSizer::CalcMin()
 {
     if (m_children.GetCount() == 0)
-        return wxSize(2,2);
+        return wxSize(10,10);
 
     m_stretchable = 0;
     m_minWidth = 0;
@@ -570,7 +570,7 @@ wxSize wxStaticBoxSizer::CalcMin()
     int other_border = 5;
 
     wxSize ret( wxBoxSizer::CalcMin() );
-    ret.x += 2*top_border;
+    ret.x += 2*other_border;
     ret.y += other_border + top_border;
 
     return ret;