make it possible to change the text of the item being edited from OnBeginLabelEdit()

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

diff --git a/src/xrc/xh_html.cpp b/src/xrc/xh_html.cpp
index 183e0ae5ef5fd01d3d29ac251622e2b4302e9229..f7fe6ae91f8483edea130ddaaee5b6b96af50ef5 100644 (file)
--- a/src/xrc/xh_html.cpp
+++ b/src/xrc/xh_html.cpp
@@ -7,8 +7,8 @@
 // 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
 
@@ -19,19 +19,21 @@
     #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"
 
+IMPLEMENT_DYNAMIC_CLASS(wxHtmlWindowXmlHandler, wxXmlResourceHandler)
 
-wxHtmlWindowXmlHandler::wxHtmlWindowXmlHandler() 
-: wxXmlResourceHandler() 
+wxHtmlWindowXmlHandler::wxHtmlWindowXmlHandler()
+: wxXmlResourceHandler()
 {
     XRC_ADD_STYLE(wxHW_SCROLLBAR_NEVER);
     XRC_ADD_STYLE(wxHW_SCROLLBAR_AUTO);
+    XRC_ADD_STYLE(wxHW_NO_SELECTION);
     AddWindowStyles();
 }
 
@@ -54,7 +56,7 @@ wxObject *wxHtmlWindowXmlHandler::DoCreateResource()
     {
         wxString url = GetParamValue(wxT("url"));
         wxFileSystem& fsys = GetCurFileSystem();
-        
+
         wxFSFile *f = fsys.OpenFile(url);
         if (f)
         {
@@ -64,14 +66,14 @@ wxObject *wxHtmlWindowXmlHandler::DoCreateResource()
         else
             control->LoadPage(url);
     }
-    
+
     else if (HasParam(wxT("htmlcode")))
     {
         control->SetPage(GetText(wxT("htmlcode")));
     }
 
     SetupWindow(control);
-    
+
     return control;
 }
 
@@ -80,4 +82,4 @@ bool wxHtmlWindowXmlHandler::CanHandle(wxXmlNode *node)
     return IsOfClass(node, wxT("wxHtmlWindow"));
 }
 
-#endif // wxUSE_HTML
+#endif // wxUSE_XRC && wxUSE_HTML