fixed XRC handler for sizers to do the expected thing when putting controls into...

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

diff --git a/src/xrc/xh_sizer.cpp b/src/xrc/xh_sizer.cpp
index 8e5e9793c451efbaeb987bb48b68f04da29d35c8..4b5f0b03aa1af7ab80faac575e33af12472ca8f8 100644 (file)
--- a/src/xrc/xh_sizer.cpp
+++ b/src/xrc/xh_sizer.cpp
@@ -27,6 +27,7 @@
     #include "wx/frame.h"
     #include "wx/dialog.h"
     #include "wx/button.h"
+    #include "wx/scrolwin.h"
 #endif
 
 #include "wx/gbsizer.h"
@@ -236,7 +237,16 @@ wxObject* wxSizerXmlHandler::Handle_sizer()
         wxXmlNode *nd = m_node;
         m_node = parentNode;
         if (GetSize() == wxDefaultSize)
-            sizer->Fit(m_parentAsWindow);
+        {
+            if ( wxDynamicCast(m_parentAsWindow, wxScrolledWindow) != NULL )
+            {
+                sizer->FitInside(m_parentAsWindow);
+            }
+            else
+            {
+                sizer->Fit(m_parentAsWindow);
+            }
+        }
         m_node = nd;
 
         if (m_parentAsWindow->IsTopLevel())