Add wxLaunchDefaultBrowser, note wxGetKeyState change

[wxWidgets.git] / include / wx / html / htmlproc.h

diff --git a/include/wx/html/htmlproc.h b/include/wx/html/htmlproc.h
index fecd1562c6360680a8c55e6bf3bdd2aca2efe78c..440301c5b850a07d990ee0efa4df50ee1ec1c3cb 100644 (file)
--- a/include/wx/html/htmlproc.h
+++ b/include/wx/html/htmlproc.h
@@ -4,15 +4,15 @@
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 Vaclav Slavik
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 Vaclav Slavik

-// Licence:     wxWindows Licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 
 #ifndef _WX_HTMLPREP_H_
 #define _WX_HTMLPREP_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 
 #ifndef _WX_HTMLPREP_H_
 #define _WX_HTMLPREP_H_
 

-#ifdef __GNUG__
-#pragma interface "htmlprep.h"
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+#pragma interface "htmlproc.h"

 // (implementation is in htmlwin.cpp, there's no htmlprep.cpp!)
 #endif
 
 // (implementation is in htmlwin.cpp, there's no htmlprep.cpp!)
 #endif
 


@@ -30,17 +30,17 @@ enum
     wxHTML_PRIORITY_SYSTEM   = 256  // >=256 is only for wxHTML's internals
 };
 
     wxHTML_PRIORITY_SYSTEM   = 256  // >=256 is only for wxHTML's internals
 };
 

-// Classes derived from this class serve as simple text processors for 
+// Classes derived from this class serve as simple text processors for

 // wxHtmlWindow. wxHtmlWindow runs HTML markup through all registered
 // processors before displaying it, thus allowing for on-the-fly
 // modifications of the markup.
 
 // wxHtmlWindow. wxHtmlWindow runs HTML markup through all registered
 // processors before displaying it, thus allowing for on-the-fly
 // modifications of the markup.
 

-class WXDLLEXPORT wxHtmlProcessor : public wxObject
+class WXDLLIMPEXP_HTML wxHtmlProcessor : public wxObject

 {
     DECLARE_ABSTRACT_CLASS(wxHtmlProcessor)
 
 public:
 {
     DECLARE_ABSTRACT_CLASS(wxHtmlProcessor)
 
 public:

-    wxHtmlProcessor() : wxObject() {}
+    wxHtmlProcessor() : wxObject(), m_enabled(true) {}

     virtual ~wxHtmlProcessor() {}
 
     // Process input text and return processed result
     virtual ~wxHtmlProcessor() {}
 
     // Process input text and return processed result


@@ -49,6 +49,14 @@ public:
     // Return priority value of this processor. The higher, the sooner
     // is the processor applied to the text.
     virtual int GetPriority() const { return wxHTML_PRIORITY_DONTCARE; }
     // Return priority value of this processor. The higher, the sooner
     // is the processor applied to the text.
     virtual int GetPriority() const { return wxHTML_PRIORITY_DONTCARE; }

+
+    // Enable/disable the processor. wxHtmlWindow won't use a disabled
+    // processor even if it is in its processors queue.
+    virtual void Enable(bool enable = true) { m_enabled = enable; }
+    bool IsEnabled() const { return m_enabled; }
+
+protected:
+    bool m_enabled;

 };
 
 #endif // wxUSE_HTML
 };
 
 #endif // wxUSE_HTML