oops... conflict removed

[wxWidgets.git] / contrib / src / xml / xh_chckb.cpp

diff --git a/contrib/src/xml/xh_chckb.cpp b/contrib/src/xml/xh_chckb.cpp
index 9cfddeb63e52b66ba509f54fc3711fbd27e7a02a..057de6e462713a5ff89fd5fb9475765f4201243c 100644 (file)
--- a/contrib/src/xml/xh_chckb.cpp
+++ b/contrib/src/xml/xh_chckb.cpp
@@ -34,14 +34,14 @@ wxObject *wxCheckBoxXmlHandler::DoCreateResource()
 { 
     wxCheckBox *control = new wxCheckBox(m_ParentAsWindow,
                                     GetID(),
 { 
     wxCheckBox *control = new wxCheckBox(m_ParentAsWindow,
                                     GetID(),

-                                    GetText(_T("label")),
+                                    GetText(wxT("label")),

                                     GetPosition(), GetSize(),
                                     GetStyle(),
                                     wxDefaultValidator,
                                     GetName()
                                     );
 
                                     GetPosition(), GetSize(),
                                     GetStyle(),
                                     wxDefaultValidator,
                                     GetName()
                                     );
 

-    control->SetValue( GetBool( _T("checked")));
+    control->SetValue( GetBool( wxT("checked")));

     SetupWindow(control);
     
     return control;
     SetupWindow(control);
     
     return control;


@@ -51,7 +51,7 @@ wxObject *wxCheckBoxXmlHandler::DoCreateResource()
 
 bool wxCheckBoxXmlHandler::CanHandle(wxXmlNode *node)
 {
 
 bool wxCheckBoxXmlHandler::CanHandle(wxXmlNode *node)
 {

-    return node->GetName() == _T("checkbox");
+    return IsOfClass(node, wxT("wxCheckBox"));

 }
 
 #endif
 }
 
 #endif