overseeing the obvious, there is already a perfect scroll call for HIView...

[wxWidgets.git] / contrib / src / xrc / xh_sizer.cpp

diff --git a/contrib/src/xrc/xh_sizer.cpp b/contrib/src/xrc/xh_sizer.cpp
index 5590ded11ea6b64c08ee7ad3061b65a50c36321d..2e3f3e49083bedd973ef99f151c0d46c91edc06f 100644 (file)
--- a/contrib/src/xrc/xh_sizer.cpp
+++ b/contrib/src/xrc/xh_sizer.cpp
@@ -122,7 +122,6 @@ wxObject* wxSizerXmlHandler::Handle_sizeritem()
     {
         // create a sizer item for it
         wxSizerItem* sitem = MakeSizerItem();
     {
         // create a sizer item for it
         wxSizerItem* sitem = MakeSizerItem();

-        SetSizerItemAttributes(sitem);

         
         // now fetch the item to be managed
         bool old_gbs = m_isGBS;
         
         // now fetch the item to be managed
         bool old_gbs = m_isGBS;


@@ -146,6 +145,9 @@ wxObject* wxSizerXmlHandler::Handle_sizeritem()
         else 
             wxLogError(wxT("Error in resource."));
 
         else 
             wxLogError(wxT("Error in resource."));
 

+        // finally, set other wxSizerItem attributes
+        SetSizerItemAttributes(sitem);
+

         AddSizerItem(sitem);
         return item;
     }
         AddSizerItem(sitem);
         return item;
     }


@@ -339,7 +341,7 @@ void wxSizerXmlHandler::SetSizerItemAttributes(wxSizerItem* sitem)
     sitem->SetBorder(GetDimension(wxT("border")));
     wxSize sz = GetSize(wxT("minsize"));
     if (!(sz == wxDefaultSize))
     sitem->SetBorder(GetDimension(wxT("border")));
     wxSize sz = GetSize(wxT("minsize"));
     if (!(sz == wxDefaultSize))

-        sitem->SetInitSize(sz.x, sz.y);
+        sitem->SetMinSize(sz);

     sz = GetSize(wxT("ratio"));
     if (!(sz == wxDefaultSize))
         sitem->SetRatio(sz);
     sz = GetSize(wxT("ratio"));
     if (!(sz == wxDefaultSize))
         sitem->SetRatio(sz);