added English and English US for testing

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

diff --git a/src/common/sizer.cpp b/src/common/sizer.cpp
index a41263744895ad26306f145f00f30160586bca7a..e71d728a8b312bdfd369f42487ff4f8a69966825 100644 (file)
--- a/src/common/sizer.cpp
+++ b/src/common/sizer.cpp
@@ -163,30 +163,12 @@ wxSize wxSizerItem::CalcMin()
 
 void wxSizerItem::SetDimension( wxPoint pos, wxSize size )
 {
 
 void wxSizerItem::SetDimension( wxPoint pos, wxSize size )
 {

-    m_pos = pos;
-
-    if (m_flag & wxWEST)
+    if (m_flag & wxSHAPED)

     {
     {

-        pos.x += m_border;
-        size.x -= m_border;
-    }
-    if (m_flag & wxEAST)
-    {
-        size.x -= m_border;
-    }
-    if (m_flag & wxNORTH)
-    {
-        pos.y += m_border;
-        size.y -= m_border;
-    }
-    if (m_flag & wxSOUTH)
-    {
-        size.y -= m_border;
-    }
-    if (m_flag & wxSHAPED) {

         // adjust aspect ratio
         int rwidth = (int) (size.y * m_ratio);
         // adjust aspect ratio
         int rwidth = (int) (size.y * m_ratio);

-        if (rwidth > size.x) {
+        if (rwidth > size.x)
+        {

             // fit horizontally
             int rheight = (int) (size.x / m_ratio);
             // add vertical space
             // fit horizontally
             int rheight = (int) (size.x / m_ratio);
             // add vertical space


@@ -196,7 +178,9 @@ void wxSizerItem::SetDimension( wxPoint pos, wxSize size )
                 pos.y += (size.y - rheight);
             // use reduced dimensions
             size.y =rheight;
                 pos.y += (size.y - rheight);
             // use reduced dimensions
             size.y =rheight;

-        } else if (rwidth < size.x) {
+        }
+        else if (rwidth < size.x)
+        {

             // add horizontal space
             if (m_flag & wxALIGN_CENTER_HORIZONTAL)
                 pos.x += (size.x - rwidth) / 2;
             // add horizontal space
             if (m_flag & wxALIGN_CENTER_HORIZONTAL)
                 pos.x += (size.x - rwidth) / 2;


@@ -205,6 +189,30 @@ void wxSizerItem::SetDimension( wxPoint pos, wxSize size )
             size.x = rwidth;
         }
     }
             size.x = rwidth;
         }
     }

+    
+    // This is what GetPosition() returns. Since we calculate
+    // borders afterwards, GetPosition() will be the left/top
+    // corner of the surrounding border.
+    m_pos = pos;
+
+    if (m_flag & wxWEST)
+    {
+        pos.x += m_border;
+        size.x -= m_border;
+    }
+    if (m_flag & wxEAST)
+    {
+        size.x -= m_border;
+    }
+    if (m_flag & wxNORTH)
+    {
+        pos.y += m_border;
+        size.y -= m_border;
+    }
+    if (m_flag & wxSOUTH)
+    {
+        size.y -= m_border;
+    }

 
     if (IsSizer())
         m_sizer->SetDimension( pos.x, pos.y, size.x, size.y );
 
     if (IsSizer())
         m_sizer->SetDimension( pos.x, pos.y, size.x, size.y );