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

diff --git a/src/xrc/xh_sizer.cpp b/src/xrc/xh_sizer.cpp
index a9779ecc72f886d09f4df2dfd08e55fa97066cb1..2e6bc72c4a89c0a91e01f981797707d3cf7ca493 100644 (file)
--- 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);
 
     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();
 
     else if (m_class == wxT("wxWrapSizer"))

-        sizer = Handle_wxGridBagSizer();
+        sizer = Handle_wxWrapSizer();

 
     if ( !sizer )
     {
 
     if ( !sizer )
     {


@@ -313,7 +317,7 @@ wxSizer*  wxSizerXmlHandler::Handle_wxGridBagSizer()
 
 wxSizer*  wxSizerXmlHandler::Handle_wxWrapSizer()
 {
 
 wxSizer*  wxSizerXmlHandler::Handle_wxWrapSizer()
 {

-    wxWrapSizer *sizer = new wxWrapSizer(GetStyle("orient"), wxHORIZONTAL);
+    wxWrapSizer *sizer = new wxWrapSizer(GetStyle("orient"), GetStyle("flag"));

     return sizer;
 }
 
     return sizer;
 }