From ace1785b153d4873a7c7684047c144facd11a26d Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Wed, 12 May 2004 09:08:36 +0000 Subject: [PATCH] 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 --- 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 1450db5857..2ac6d4face 100644 --- a/contrib/src/xrc/xh_scwin.cpp +++ b/contrib/src/xrc/xh_scwin.cpp @@ -43,6 +43,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 40fc9246df..9bc524dc34 100644 --- 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); + AddWindowStyles(); } wxObject *wxToolBarXmlHandler::DoCreateResource() diff --git a/src/xrc/xh_scwin.cpp b/src/xrc/xh_scwin.cpp index 1450db5857..2ac6d4face 100644 --- a/src/xrc/xh_scwin.cpp +++ b/src/xrc/xh_scwin.cpp @@ -43,6 +43,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 40fc9246df..9bc524dc34 100644 --- 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); + AddWindowStyles(); } wxObject *wxToolBarXmlHandler::DoCreateResource()