check for m_parentAsWindow!=NULL

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

diff --git a/contrib/src/xrc/xh_html.cpp b/contrib/src/xrc/xh_html.cpp
index 53b0808bdf1ff5382e2ebd174607fb7608f48bff..8fe80d2082160ddb0bb17d10f9236e8466f8aa5e 100644 (file)
--- a/contrib/src/xrc/xh_html.cpp
+++ b/contrib/src/xrc/xh_html.cpp
@@ -26,32 +26,35 @@
 #include "wx/html/htmlwin.h"
 #include "wx/filesys.h"
 
 #include "wx/html/htmlwin.h"
 #include "wx/filesys.h"
 

+IMPLEMENT_DYNAMIC_CLASS(wxHtmlWindowXmlHandler, wxXmlResourceHandler)

 
 wxHtmlWindowXmlHandler::wxHtmlWindowXmlHandler() 
 : wxXmlResourceHandler() 
 {
 
 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);
+    XRC_ADD_STYLE(wxHW_NO_SELECTION);

     AddWindowStyles();
 }
 
 wxObject *wxHtmlWindowXmlHandler::DoCreateResource()
     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);
         wxFileSystem& fsys = GetCurFileSystem();
         
         wxFSFile *f = fsys.OpenFile(url);


@@ -64,9 +67,9 @@ wxObject *wxHtmlWindowXmlHandler::DoCreateResource()
             control->LoadPage(url);
     }
     
             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);
     }
 
     SetupWindow(control);


@@ -74,8 +77,6 @@ wxObject *wxHtmlWindowXmlHandler::DoCreateResource()
     return control;
 }
 
     return control;
 }
 

-
-

 bool wxHtmlWindowXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxHtmlWindow"));
 bool wxHtmlWindowXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxHtmlWindow"));