file which undefs symbols ocnflicting with windows.h

[wxWidgets.git] / include / wx / helpbase.h

diff --git a/include/wx/helpbase.h b/include/wx/helpbase.h
index ee38db1f10a456d57e1a34a4dc7122b78d2eec55..b93771f8064d14bbbe22f2602b3f0be8b298a578 100644 (file)
--- a/include/wx/helpbase.h
+++ b/include/wx/helpbase.h
@@ -20,6 +20,9 @@
 
 #if wxUSE_HELP
 
 
 #if wxUSE_HELP
 

+// Flags for SetViewer
+#define wxHELP_NETSCAPE     1
+

 // Defines the API for help controllers
 class WXDLLEXPORT wxHelpControllerBase: public wxObject
 {
 // Defines the API for help controllers
 class WXDLLEXPORT wxHelpControllerBase: public wxObject
 {


@@ -32,9 +35,12 @@ class WXDLLEXPORT wxHelpControllerBase: public wxObject
   // Must call this to set the filename and server name.
   // server is only required when implementing TCP/IP-based
   // help controllers.
   // Must call this to set the filename and server name.
   // server is only required when implementing TCP/IP-based
   // help controllers.

-  virtual bool Initialize(const wxString& file, int server) { return FALSE; };
+  virtual bool Initialize(const wxString& WXUNUSED(file), int WXUNUSED(server) ) { return FALSE; };

   virtual bool Initialize(const wxString& file) = 0;
 
   virtual bool Initialize(const wxString& file) = 0;
 

+  // Set viewer: only relevant to some kinds of controller
+  virtual void SetViewer(const wxString& WXUNUSED(viewer), long WXUNUSED(flags) = 0) {}
+

   // If file is "", reloads file given  in Initialize
   virtual bool LoadFile(const wxString& file = "") = 0;
   virtual bool DisplayContents(void) = 0;
   // If file is "", reloads file given  in Initialize
   virtual bool LoadFile(const wxString& file = "") = 0;
   virtual bool DisplayContents(void) = 0;