can't pass objects through ... (please don't ever ignore this gcc warning)

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

diff --git a/src/xrc/xh_chckb.cpp b/src/xrc/xh_chckb.cpp
index 9bd2eb99ace4f78a886aa9a46e2b3cc917de3a88..f67b7beb547d22b932ee3d5fea93abddd5ec7df7 100644 (file)
--- a/src/xrc/xh_chckb.cpp
+++ b/src/xrc/xh_chckb.cpp
@@ -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,39 +15,44 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_XRC && wxUSE_CHECKBOX
+
 #include "wx/xrc/xh_chckb.h"
 #include "wx/checkbox.h"
 
-#if wxUSE_CHECKBOX
+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()
-{ 
-    wxCheckBox *control = new wxCheckBox(m_parentAsWindow,
-                                    GetID(),
-                                    GetText(wxT("label")),
-                                    GetPosition(), GetSize(),
-                                    GetStyle(),
-                                    wxDefaultValidator,
-                                    GetName()
-                                    );
-
-    control->SetValue( GetBool( wxT("checked")));
+{
+    XRC_MAKE_INSTANCE(control, wxCheckBox)
+
+    control->Create(m_parentAsWindow,
+                    GetID(),
+                    GetText(wxT("label")),
+                    GetPosition(), GetSize(),
+                    GetStyle(),
+                    wxDefaultValidator,
+                    GetName());
+
+    control->SetValue(GetBool( wxT("checked")));
     SetupWindow(control);
-    
+
     return control;
 }
 
-
-
 bool wxCheckBoxXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxCheckBox"));
 }
 
-#endif
+#endif // wxUSE_XRC && wxUSE_CHECKBOX