Warning fixes.

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

diff --git a/src/xrc/xh_chckb.cpp b/src/xrc/xh_chckb.cpp
index 242a33645be34a04f9b261231d2c5a11a27e3911..3731c6b8899351b90c248128872601842cad7ed9 100644 (file)
--- a/src/xrc/xh_chckb.cpp
+++ b/src/xrc/xh_chckb.cpp
@@ -19,16 +19,20 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_XRC && wxUSE_CHECKBOX
+

 #include "wx/xrc/xh_chckb.h"
 #include "wx/checkbox.h"
 
 #include "wx/xrc/xh_chckb.h"
 #include "wx/checkbox.h"
 

-#if wxUSE_CHECKBOX
-

 IMPLEMENT_DYNAMIC_CLASS(wxCheckBoxXmlHandler, wxXmlResourceHandler)
 
 wxCheckBoxXmlHandler::wxCheckBoxXmlHandler()
 : wxXmlResourceHandler()
 {
 IMPLEMENT_DYNAMIC_CLASS(wxCheckBoxXmlHandler, wxXmlResourceHandler)
 
 wxCheckBoxXmlHandler::wxCheckBoxXmlHandler()
 : wxXmlResourceHandler()
 {

+    XRC_ADD_STYLE(wxCHK_2STATE);
+    XRC_ADD_STYLE(wxCHK_3STATE);
+    XRC_ADD_STYLE(wxCHK_ALLOW_3RD_STATE_FOR_USER);
+    XRC_ADD_STYLE(wxALIGN_RIGHT);

     AddWindowStyles();
 }
 
     AddWindowStyles();
 }
 


@@ -55,4 +59,4 @@ bool wxCheckBoxXmlHandler::CanHandle(wxXmlNode *node)
     return IsOfClass(node, wxT("wxCheckBox"));
 }
 
     return IsOfClass(node, wxT("wxCheckBox"));
 }
 

-#endif
+#endif // wxUSE_XRC && wxUSE_CHECKBOX