From 1808bb47b9899bc730a2e2424bb54668aebfe789 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 24 Dec 2008 00:29:38 +0000 Subject: [PATCH] also call AddGrowableRow/Col() for wxGridBagSizer git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57520 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/xrc/xh_sizer.h | 2 +- src/xrc/xh_sizer.cpp | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/include/wx/xrc/xh_sizer.h b/include/wx/xrc/xh_sizer.h index a6cbe7a31c..6c3992c787 100644 --- 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 6e2d92cf5f..fb21758c0b 100644 --- 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"))); } -- 2.45.2