From 63b37a4e648320827a5b4a3161be13154370b5c3 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 22 May 2008 00:33:12 +0000 Subject: [PATCH] add handling of wxWrapSizer flags (part of ticket 9468) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53695 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/xrc/xh_sizer.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/xrc/xh_sizer.cpp b/src/xrc/xh_sizer.cpp index a9779ecc72..2e6bc72c4a 100644 --- a/src/xrc/xh_sizer.cpp +++ b/src/xrc/xh_sizer.cpp @@ -80,6 +80,10 @@ wxSizerXmlHandler::wxSizerXmlHandler() XRC_ADD_STYLE(wxFIXED_MINSIZE); XRC_ADD_STYLE(wxRESERVE_SPACE_EVEN_IF_HIDDEN); + + // wxWrapSizer-specific flags + XRC_ADD_STYLE(wxEXTEND_LAST_ON_EACH_LINE); + XRC_ADD_STYLE(wxREMOVE_LEADING_SPACES); } @@ -209,7 +213,7 @@ wxObject* wxSizerXmlHandler::Handle_sizer() sizer = Handle_wxGridBagSizer(); else if (m_class == wxT("wxWrapSizer")) - sizer = Handle_wxGridBagSizer(); + sizer = Handle_wxWrapSizer(); if ( !sizer ) { @@ -313,7 +317,7 @@ wxSizer* wxSizerXmlHandler::Handle_wxGridBagSizer() wxSizer* wxSizerXmlHandler::Handle_wxWrapSizer() { - wxWrapSizer *sizer = new wxWrapSizer(GetStyle("orient"), wxHORIZONTAL); + wxWrapSizer *sizer = new wxWrapSizer(GetStyle("orient"), GetStyle("flag")); return sizer; } -- 2.45.2