Don't release capture unless we already have it.

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

diff --git a/src/xrc/xh_html.cpp b/src/xrc/xh_html.cpp
index dab79dc4c5258aea7a43cf1f78527a3897f368d9..f7fe6ae91f8483edea130ddaaee5b6b96af50ef5 100644 (file)
--- a/src/xrc/xh_html.cpp
+++ b/src/xrc/xh_html.cpp
@@ -1,14 +1,14 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_html.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_html.cpp

-// Purpose:     XML resource for wxHtmlWindow
+// Purpose:     XRC resource for wxHtmlWindow

 // Author:      Bob Mitchell
 // Created:     2000/03/21
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 Bob Mitchell and Verant Interactive
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Author:      Bob Mitchell
 // Created:     2000/03/21
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 Bob Mitchell and Verant Interactive
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

- 
-#ifdef __GNUG__
+
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "xh_html.h"
 #endif
 
 #pragma implementation "xh_html.h"
 #endif
 


@@ -19,41 +19,44 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#include "wx/xrc/xh_html.h"
+#if wxUSE_XRC && wxUSE_HTML

 
 

-#if wxUSE_HTML
+#include "wx/xrc/xh_html.h"

 
 #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()
-                                    );
-
-    if( HasParam( wxT("borders") ))
+{
+    XRC_MAKE_INSTANCE(control, wxHtmlWindow)
+
+    control->Create(m_parentAsWindow,
+                    GetID(),
+                    GetPosition(), GetSize(),
+                    GetStyle(wxT("style"), wxHW_SCROLLBAR_AUTO),
+                    GetName());
+
+    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();
         wxFileSystem& fsys = GetCurFileSystem();

-        
+

         wxFSFile *f = fsys.OpenFile(url);
         if (f)
         {
         wxFSFile *f = fsys.OpenFile(url);
         if (f)
         {


@@ -63,22 +66,20 @@ wxObject *wxHtmlWindowXmlHandler::DoCreateResource()
         else
             control->LoadPage(url);
     }
         else
             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);

-    
+

     return control;
 }
 
     return control;
 }
 

-
-

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

-#endif // wxUSE_HTML
+#endif // wxUSE_XRC && wxUSE_HTML