code cleanup

[wxWidgets.git] / src / xrc / xh_choicbk.cpp

diff --git a/src/xrc/xh_choicbk.cpp b/src/xrc/xh_choicbk.cpp
index c828b233c901f98dc62978fda078d7856676f943..48a00b3044464919dfba318813b55576aff2a463 100644 (file)
--- a/src/xrc/xh_choicbk.cpp
+++ b/src/xrc/xh_choicbk.cpp
@@ -1,16 +1,13 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        xh_choicbk.cpp
+// Name:        src/xrc/xh_choicbk.cpp
 // Purpose:     XRC resource for wxChoicebook
 // Author:      Vaclav Slavik
 // Created:     2000/03/21
+// RCS-ID:      $Id$
 // Copyright:   (c) 2000 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "xh_choicbk.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -32,11 +29,19 @@ IMPLEMENT_DYNAMIC_CLASS(wxChoicebookXmlHandler, wxXmlResourceHandler)
 wxChoicebookXmlHandler::wxChoicebookXmlHandler()
 : wxXmlResourceHandler(), m_isInside(false), m_choicebook(NULL)
 {
-    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);
+    XRC_ADD_STYLE(wxBK_DEFAULT);
+    XRC_ADD_STYLE(wxBK_LEFT);
+    XRC_ADD_STYLE(wxBK_RIGHT);
+    XRC_ADD_STYLE(wxBK_TOP);
+    XRC_ADD_STYLE(wxBK_BOTTOM);
+
+#if WXWIN_COMPATIBILITY_2_6
+    XRC_ADD_STYLE(wxCHB_DEFAULT);
+    XRC_ADD_STYLE(wxCHB_LEFT);
+    XRC_ADD_STYLE(wxCHB_RIGHT);
+    XRC_ADD_STYLE(wxCHB_TOP);
+    XRC_ADD_STYLE(wxCHB_BOTTOM);
+#endif
 
     AddWindowStyles();
 }