use WX_ASSERT_STR/SIZET_EQUAL instead of CPPUNIT_ASSERT_EQUAL with casts

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

diff --git a/src/xrc/xh_chckb.cpp b/src/xrc/xh_chckb.cpp
index c7a0e824b64828e34a7f622863d74979d89f8ffb..4f84fccd3672396adbd09c9cb5173de65fff0503 100644 (file)
--- a/src/xrc/xh_chckb.cpp
+++ b/src/xrc/xh_chckb.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        xh_chckb.cpp
+// Name:        src/xrc/xh_chckb.cpp
 // Purpose:     XRC resource for wxCheckBox
 // Author:      Bob Mitchell
 // Created:     2000/03/21
@@ -7,10 +7,6 @@
 // Copyright:   (c) 2000 Bob Mitchell and Verant Interactive
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
- 
-#ifdef __GNUG__
-#pragma implementation "xh_chckb.h"
-#endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
@@ -19,21 +15,28 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_XRC && wxUSE_CHECKBOX
+
 #include "wx/xrc/xh_chckb.h"
-#include "wx/checkbox.h"
 
-#if wxUSE_CHECKBOX
+#ifndef WX_PRECOMP
+    #include "wx/checkbox.h"
+#endif
 
 IMPLEMENT_DYNAMIC_CLASS(wxCheckBoxXmlHandler, wxXmlResourceHandler)
 
-wxCheckBoxXmlHandler::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();
 }
 
 wxObject *wxCheckBoxXmlHandler::DoCreateResource()
-{ 
+{
     XRC_MAKE_INSTANCE(control, wxCheckBox)
 
     control->Create(m_parentAsWindow,
@@ -46,7 +49,7 @@ wxObject *wxCheckBoxXmlHandler::DoCreateResource()
 
     control->SetValue(GetBool( wxT("checked")));
     SetupWindow(control);
-    
+
     return control;
 }
 
@@ -55,4 +58,4 @@ bool wxCheckBoxXmlHandler::CanHandle(wxXmlNode *node)
     return IsOfClass(node, wxT("wxCheckBox"));
 }
 
-#endif
+#endif // wxUSE_XRC && wxUSE_CHECKBOX