X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b5d6954b87d910969226ffade9714db7429211f3..16d865f756b8bc251467139b3b75752219ab97bd:/src/xrc/xh_html.cpp?ds=sidebyside

diff --git a/src/xrc/xh_html.cpp b/src/xrc/xh_html.cpp
index 53b0808bdf..183e0ae5ef 100644
--- a/src/xrc/xh_html.cpp
+++ b/src/xrc/xh_html.cpp
@@ -30,28 +30,29 @@
 wxHtmlWindowXmlHandler::wxHtmlWindowXmlHandler() 
 : wxXmlResourceHandler() 
 {
-    ADD_STYLE( wxHW_SCROLLBAR_NEVER );
-    ADD_STYLE( wxHW_SCROLLBAR_AUTO );
+    XRC_ADD_STYLE(wxHW_SCROLLBAR_NEVER);
+    XRC_ADD_STYLE(wxHW_SCROLLBAR_AUTO);
     AddWindowStyles();
 }
 
 wxObject *wxHtmlWindowXmlHandler::DoCreateResource()
-{ 
-    wxHtmlWindow *control = new wxHtmlWindow(m_parentAsWindow,
-                                    GetID(),
-                                    GetPosition(), GetSize(),
-                                    GetStyle( wxT("style" ), wxHW_SCROLLBAR_AUTO),
-                                    GetName()
-                                    );
+{
+    XRC_MAKE_INSTANCE(control, wxHtmlWindow)
+
+    control->Create(m_parentAsWindow,
+                    GetID(),
+                    GetPosition(), GetSize(),
+                    GetStyle(wxT("style"), wxHW_SCROLLBAR_AUTO),
+                    GetName());
 
-    if( HasParam( wxT("borders") ))
+    if (HasParam(wxT("borders")))
     {
-        control->SetBorders( GetDimension( wxT("borders" )));
+        control->SetBorders(GetDimension(wxT("borders")));
     }
 
-    if( HasParam( wxT("url") ))
+    if (HasParam(wxT("url")))
     {
-        wxString url = GetParamValue(wxT("url" ));
+        wxString url = GetParamValue(wxT("url"));
         wxFileSystem& fsys = GetCurFileSystem();
         
         wxFSFile *f = fsys.OpenFile(url);
@@ -64,9 +65,9 @@ wxObject *wxHtmlWindowXmlHandler::DoCreateResource()
             control->LoadPage(url);
     }
     
-    else if( HasParam( wxT("htmlcode") ))
+    else if (HasParam(wxT("htmlcode")))
     {
-        control->SetPage( GetText(wxT("htmlcode")) );
+        control->SetPage(GetText(wxT("htmlcode")));
     }
 
     SetupWindow(control);
@@ -74,8 +75,6 @@ wxObject *wxHtmlWindowXmlHandler::DoCreateResource()
     return control;
 }
 
-
-
 bool wxHtmlWindowXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxHtmlWindow"));