also call AddGrowableRow/Col() for wxGridBagSizer

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

diff --git a/include/wx/xrc/xh_sizer.h b/include/wx/xrc/xh_sizer.h
index a6cbe7a31c0d085860547146d617ecd71aab0fa8..6c3992c7878c68de7bfb9be7477c7a77d008092b 100644 (file)
--- a/include/wx/xrc/xh_sizer.h
+++ b/include/wx/xrc/xh_sizer.h
@@ -44,7 +44,7 @@ private:
 #endif
     wxSizer*  Handle_wxGridSizer();
     wxFlexGridSizer* Handle_wxFlexGridSizer();
-    wxSizer*  Handle_wxGridBagSizer();
+    wxGridBagSizer* Handle_wxGridBagSizer();
     wxSizer*  Handle_wxWrapSizer();
 
     void SetGrowables(wxFlexGridSizer* fsizer, const wxChar* param, bool rows);

diff --git a/src/xrc/xh_sizer.cpp b/src/xrc/xh_sizer.cpp
index 6e2d92cf5fa1b19f299835461e4312bb77042e10..fb21758c0b6a2393eaa4d18974ad10a8b4f4179b 100644 (file)
--- a/src/xrc/xh_sizer.cpp
+++ b/src/xrc/xh_sizer.cpp
@@ -223,7 +223,10 @@ wxObject* wxSizerXmlHandler::Handle_sizer()
         sizer = flexsizer;
     }
     else if (m_class == wxT("wxGridBagSizer"))
-        sizer = Handle_wxGridBagSizer();
+    {
+        flexsizer = Handle_wxGridBagSizer();
+        sizer = flexsizer;
+    }
     else if (m_class == wxT("wxWrapSizer"))
         sizer = Handle_wxWrapSizer();
 
@@ -321,7 +324,7 @@ wxFlexGridSizer* wxSizerXmlHandler::Handle_wxFlexGridSizer()
 }
 
 
-wxSizer*  wxSizerXmlHandler::Handle_wxGridBagSizer()
+wxGridBagSizer* wxSizerXmlHandler::Handle_wxGridBagSizer()
 {
     return new wxGridBagSizer(GetDimension(wxT("vgap")), GetDimension(wxT("hgap")));
 }