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

diff --git a/src/xrc/xh_choicbk.cpp b/src/xrc/xh_choicbk.cpp
index a9ee4eb3ef6cf0d921b2e05c9a42d59509c3df29..c828b233c901f98dc62978fda078d7856676f943 100644 (file)
--- 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 ef7dd63a98a03a2a441cda261738bf0d21793dac..21a6cb058691c86f1386ebda4d643d0896a013a8 100644 (file)
--- 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 596df57b3621c25fa5833b0a61806267b00e30c7..cb2c6feae4a90972a30993db4d238972e2cd4f87 100644 (file)
--- 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();
 }