From 5a439c1aa409584446946ef67b9181d25528bd3c Mon Sep 17 00:00:00 2001 From: =?utf8?q?W=C5=82odzimierz=20Skiba?= Date: Tue, 1 Mar 2005 07:38:09 +0000 Subject: [PATCH] More styles in XRC handlers of book controls. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32511 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/xrc/xh_choicbk.cpp | 10 ++++++---- src/xrc/xh_listbk.cpp | 2 ++ src/xrc/xh_notbk.cpp | 7 ++++++- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/src/xrc/xh_choicbk.cpp b/src/xrc/xh_choicbk.cpp index a9ee4eb3ef..c828b233c9 100644 --- a/src/xrc/xh_choicbk.cpp +++ b/src/xrc/xh_choicbk.cpp @@ -32,10 +32,12 @@ IMPLEMENT_DYNAMIC_CLASS(wxChoicebookXmlHandler, wxXmlResourceHandler) wxChoicebookXmlHandler::wxChoicebookXmlHandler() : wxXmlResourceHandler(), m_isInside(false), m_choicebook(NULL) { - XRC_ADD_STYLE(wxLB_LEFT); - XRC_ADD_STYLE(wxLB_RIGHT); - XRC_ADD_STYLE(wxLB_TOP); - XRC_ADD_STYLE(wxLB_BOTTOM); + XRC_ADD_STYLE(wxCB_DEFAULT); + XRC_ADD_STYLE(wxCB_LEFT); + XRC_ADD_STYLE(wxCB_RIGHT); + XRC_ADD_STYLE(wxCB_TOP); + XRC_ADD_STYLE(wxCB_BOTTOM); + AddWindowStyles(); } diff --git a/src/xrc/xh_listbk.cpp b/src/xrc/xh_listbk.cpp index ef7dd63a98..21a6cb0586 100644 --- a/src/xrc/xh_listbk.cpp +++ b/src/xrc/xh_listbk.cpp @@ -32,10 +32,12 @@ IMPLEMENT_DYNAMIC_CLASS(wxListbookXmlHandler, wxXmlResourceHandler) wxListbookXmlHandler::wxListbookXmlHandler() : wxXmlResourceHandler(), m_isInside(false), m_listbook(NULL) { + XRC_ADD_STYLE(wxLB_DEFAULT); XRC_ADD_STYLE(wxLB_LEFT); XRC_ADD_STYLE(wxLB_RIGHT); XRC_ADD_STYLE(wxLB_TOP); XRC_ADD_STYLE(wxLB_BOTTOM); + AddWindowStyles(); } diff --git a/src/xrc/xh_notbk.cpp b/src/xrc/xh_notbk.cpp index 596df57b36..cb2c6feae4 100644 --- a/src/xrc/xh_notbk.cpp +++ b/src/xrc/xh_notbk.cpp @@ -33,11 +33,16 @@ IMPLEMENT_DYNAMIC_CLASS(wxNotebookXmlHandler, wxXmlResourceHandler) wxNotebookXmlHandler::wxNotebookXmlHandler() : wxXmlResourceHandler(), m_isInside(false), m_notebook(NULL) { - XRC_ADD_STYLE(wxNB_FIXEDWIDTH); + XRC_ADD_STYLE(wxNB_DEFAULT); XRC_ADD_STYLE(wxNB_LEFT); XRC_ADD_STYLE(wxNB_RIGHT); XRC_ADD_STYLE(wxNB_TOP); XRC_ADD_STYLE(wxNB_BOTTOM); + + XRC_ADD_STYLE(wxNB_FIXEDWIDTH); + XRC_ADD_STYLE(wxNB_MULTILINE); + XRC_ADD_STYLE(wxNB_NOPAGETHEME); + AddWindowStyles(); } -- 2.45.2