oops... conflict removed

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

diff --git a/contrib/src/xml/xh_scrol.cpp b/contrib/src/xml/xh_scrol.cpp
index 6e7e2b19dc46a5c702aa88152c921b1ce71de87c..73531f14016f131f3257470f85b7bc59353120b8 100644 (file)
--- a/contrib/src/xml/xh_scrol.cpp
+++ b/contrib/src/xml/xh_scrol.cpp
@@ -40,10 +40,10 @@ wxObject *wxScrollBarXmlHandler::DoCreateResource()
                                     wxDefaultValidator,
                                     GetName()
                                     );
                                     wxDefaultValidator,
                                     GetName()
                                     );

-    control->SetScrollbar(GetLong( _T("value"), 0), 
-                          GetLong( _T("thumbsize"),1),
-                          GetLong( _T("range"), 10),
-                          GetLong( _T("pagesize"),1)
+    control->SetScrollbar(GetLong( wxT("value"), 0), 
+                          GetLong( wxT("thumbsize"),1),
+                          GetLong( wxT("range"), 10),
+                          GetLong( wxT("pagesize"),1)

                           );
                           
     
                           );
                           
     


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

-    return node->GetName() == _T("scrollbar");
+    return IsOfClass(node, wxT("wxScrollBar"));

 }
 
 
 }