added 'name' to wxEditableListBox ctor

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

diff --git a/contrib/src/xml/xh_html.cpp b/contrib/src/xml/xh_html.cpp
index e94e0c8f96e9124967dfc4f8d9be0451bb90ea63..30ab0b46b2096279c00e0ea8c8e2c4e7a8420390 100644 (file)
--- a/contrib/src/xml/xh_html.cpp
+++ b/contrib/src/xml/xh_html.cpp
@@ -36,25 +36,25 @@ wxHtmlWindowXmlHandler::wxHtmlWindowXmlHandler()
 
 wxObject *wxHtmlWindowXmlHandler::DoCreateResource()
 { 
 
 wxObject *wxHtmlWindowXmlHandler::DoCreateResource()
 { 

-    wxHtmlWindow *control = new wxHtmlWindow(m_ParentAsWindow,
+    wxHtmlWindow *control = new wxHtmlWindow(m_parentAsWindow,

                                     GetID(),
                                     GetPosition(), GetSize(),
                                     GetID(),
                                     GetPosition(), GetSize(),

-                                    GetStyle( _T("style" ), wxHW_SCROLLBAR_AUTO),
+                                    GetStyle( wxT("style" ), wxHW_SCROLLBAR_AUTO),

                                     GetName()
                                     );
 
                                     GetName()
                                     );
 

-    if( HasParam( _T("borders") ))
+    if( HasParam( wxT("borders") ))

     {
     {

-        control->SetBorders( GetDimension( _T("borders" )));
+        control->SetBorders( GetDimension( wxT("borders" )));

     }
 
     }
 

-    if( HasParam( _T("url") ))
+    if( HasParam( wxT("url") ))

     {
     {

-        control->LoadPage( GetParamValue( _T("url" )));
+        control->LoadPage( GetParamValue( wxT("url" )));

     }
     }

-    else if( HasParam( _T("htmlcode") ))
+    else if( HasParam( wxT("htmlcode") ))

     {
     {

-        control->SetPage( GetText(_T("htmlcode")) );
+        control->SetPage( GetText(wxT("htmlcode")) );

     }
 
     SetupWindow(control);
     }
 
     SetupWindow(control);


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

-    return node->GetName() == _T("htmlwindow");
+    return IsOfClass(node, wxT("wxHtmlWindow"));

 }
 
 #endif // wxUSE_HTML
 }
 
 #endif // wxUSE_HTML