X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bebb14d53dc0efbf04e57934a70ae39e10819d96..9c21efe30131c78c25763446e0754e2a0b54dc30:/contrib/src/xml/xh_html.cpp

diff --git a/contrib/src/xml/xh_html.cpp b/contrib/src/xml/xh_html.cpp
index ca1b9bac2f..fba431d79f 100644
--- a/contrib/src/xml/xh_html.cpp
+++ b/contrib/src/xml/xh_html.cpp
@@ -31,6 +31,7 @@ wxHtmlWindowXmlHandler::wxHtmlWindowXmlHandler()
 {
     ADD_STYLE( wxHW_SCROLLBAR_NEVER );
     ADD_STYLE( wxHW_SCROLLBAR_AUTO );
+    AddWindowStyles();
 }
 
 wxObject *wxHtmlWindowXmlHandler::DoCreateResource()
@@ -38,22 +39,22 @@ wxObject *wxHtmlWindowXmlHandler::DoCreateResource()
     wxHtmlWindow *control = new wxHtmlWindow(m_ParentAsWindow,
                                     GetID(),
                                     GetPosition(), GetSize(),
-                                    GetStyle( _T("style" ), wxHW_SCROLLBAR_AUTO),
+                                    GetStyle( wxT("style" ), wxHW_SCROLLBAR_AUTO),
                                     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);
@@ -65,7 +66,7 @@ wxObject *wxHtmlWindowXmlHandler::DoCreateResource()
 
 bool wxHtmlWindowXmlHandler::CanHandle(wxXmlNode *node)
 {
-    return node->GetName() == _T("htmlwindow");
+    return IsOfClass(node, wxT("wxHtmlWindow"));
 }
 
 #endif // wxUSE_HTML