From aea258040bcc92cb59e83f2de4e526d078069196 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Wed, 12 May 2004 09:06:39 +0000 Subject: [PATCH] Added window styles for wxToolBar handler Allow wxScrolledWindow to have children git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@27223 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- contrib/src/xrc/xh_scwin.cpp | 1 + contrib/src/xrc/xh_toolb.cpp | 1 + src/xrc/xh_scwin.cpp | 1 + src/xrc/xh_toolb.cpp | 1 + 4 files changed, 4 insertions(+) diff --git a/contrib/src/xrc/xh_scwin.cpp b/contrib/src/xrc/xh_scwin.cpp index 9aedfefe57..81c8b31573 100644 --- a/contrib/src/xrc/xh_scwin.cpp +++ b/contrib/src/xrc/xh_scwin.cpp @@ -42,6 +42,7 @@ wxObject *wxScrolledWindowXmlHandler::DoCreateResource() GetName()); SetupWindow(control); + CreateChildren(control); return control; } diff --git a/contrib/src/xrc/xh_toolb.cpp b/contrib/src/xrc/xh_toolb.cpp index 78a81f3f74..ad772ee357 100644 --- a/contrib/src/xrc/xh_toolb.cpp +++ b/contrib/src/xrc/xh_toolb.cpp @@ -37,6 +37,7 @@ wxToolBarXmlHandler::wxToolBarXmlHandler() XRC_ADD_STYLE(wxTB_NOICONS); XRC_ADD_STYLE(wxTB_NODIVIDER); XRC_ADD_STYLE(wxTB_NOALIGN); + AddWindowStyles(); } wxObject *wxToolBarXmlHandler::DoCreateResource() diff --git a/src/xrc/xh_scwin.cpp b/src/xrc/xh_scwin.cpp index 9aedfefe57..81c8b31573 100644 --- a/src/xrc/xh_scwin.cpp +++ b/src/xrc/xh_scwin.cpp @@ -42,6 +42,7 @@ wxObject *wxScrolledWindowXmlHandler::DoCreateResource() GetName()); SetupWindow(control); + CreateChildren(control); return control; } diff --git a/src/xrc/xh_toolb.cpp b/src/xrc/xh_toolb.cpp index 78a81f3f74..ad772ee357 100644 --- a/src/xrc/xh_toolb.cpp +++ b/src/xrc/xh_toolb.cpp @@ -37,6 +37,7 @@ wxToolBarXmlHandler::wxToolBarXmlHandler() XRC_ADD_STYLE(wxTB_NOICONS); XRC_ADD_STYLE(wxTB_NODIVIDER); XRC_ADD_STYLE(wxTB_NOALIGN); + AddWindowStyles(); } wxObject *wxToolBarXmlHandler::DoCreateResource()