Added window styles to wxToolBar handler.

Allow wxScrolledWindow to have children.

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

diff --git a/contrib/src/xrc/xh_scwin.cpp b/contrib/src/xrc/xh_scwin.cpp
index 1450db585709ac7d268d222bb86b9f54bccbfc01..2ac6d4face3cda2a41cfc4f62ef9c8fc617892f7 100644 (file)
--- a/contrib/src/xrc/xh_scwin.cpp
+++ b/contrib/src/xrc/xh_scwin.cpp
@@ -43,6 +43,7 @@ wxObject *wxScrolledWindowXmlHandler::DoCreateResource()
                     GetName());
 
     SetupWindow(control);
                     GetName());
 
     SetupWindow(control);

+    CreateChildren(control);

     
     return control;
 }
     
     return control;
 }

diff --git a/contrib/src/xrc/xh_toolb.cpp b/contrib/src/xrc/xh_toolb.cpp
index 40fc9246df9891200836849962e6571156d72376..9bc524dc34c25f5751f34bfd583e146c5b39174b 100644 (file)
--- a/contrib/src/xrc/xh_toolb.cpp
+++ b/contrib/src/xrc/xh_toolb.cpp
@@ -39,6 +39,7 @@ wxToolBarXmlHandler::wxToolBarXmlHandler()
     XRC_ADD_STYLE(wxTB_NOICONS);
     XRC_ADD_STYLE(wxTB_NODIVIDER);
     XRC_ADD_STYLE(wxTB_NOALIGN);
     XRC_ADD_STYLE(wxTB_NOICONS);
     XRC_ADD_STYLE(wxTB_NODIVIDER);
     XRC_ADD_STYLE(wxTB_NOALIGN);

+    AddWindowStyles();

 }
 
 wxObject *wxToolBarXmlHandler::DoCreateResource()
 }
 
 wxObject *wxToolBarXmlHandler::DoCreateResource()

diff --git a/src/xrc/xh_scwin.cpp b/src/xrc/xh_scwin.cpp
index 1450db585709ac7d268d222bb86b9f54bccbfc01..2ac6d4face3cda2a41cfc4f62ef9c8fc617892f7 100644 (file)
--- a/src/xrc/xh_scwin.cpp
+++ b/src/xrc/xh_scwin.cpp
@@ -43,6 +43,7 @@ wxObject *wxScrolledWindowXmlHandler::DoCreateResource()
                     GetName());
 
     SetupWindow(control);
                     GetName());
 
     SetupWindow(control);

+    CreateChildren(control);

     
     return control;
 }
     
     return control;
 }

diff --git a/src/xrc/xh_toolb.cpp b/src/xrc/xh_toolb.cpp
index 40fc9246df9891200836849962e6571156d72376..9bc524dc34c25f5751f34bfd583e146c5b39174b 100644 (file)
--- a/src/xrc/xh_toolb.cpp
+++ b/src/xrc/xh_toolb.cpp
@@ -39,6 +39,7 @@ wxToolBarXmlHandler::wxToolBarXmlHandler()
     XRC_ADD_STYLE(wxTB_NOICONS);
     XRC_ADD_STYLE(wxTB_NODIVIDER);
     XRC_ADD_STYLE(wxTB_NOALIGN);
     XRC_ADD_STYLE(wxTB_NOICONS);
     XRC_ADD_STYLE(wxTB_NODIVIDER);
     XRC_ADD_STYLE(wxTB_NOALIGN);

+    AddWindowStyles();

 }
 
 wxObject *wxToolBarXmlHandler::DoCreateResource()
 }
 
 wxObject *wxToolBarXmlHandler::DoCreateResource()