char handling fixed again

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

diff --git a/include/wx/helpbase.h b/include/wx/helpbase.h
index 24557948d1654a1a8b751ab23cf2277b479feb48..b93771f8064d14bbbe22f2602b3f0be8b298a578 100644 (file)
--- a/include/wx/helpbase.h
+++ b/include/wx/helpbase.h
@@ -9,8 +9,8 @@
 // Licence:    wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __HELPBASEH__
-#define __HELPBASEH__
+#ifndef _WX_HELPBASEH__
+#define _WX_HELPBASEH__

 
 #ifdef __GNUG__
 #pragma interface "helpbase.h"
 
 #ifdef __GNUG__
 #pragma interface "helpbase.h"


@@ -18,7 +18,10 @@
 
 #include "wx/wx.h"
 
 
 #include "wx/wx.h"
 

-#if USE_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,7 +35,11 @@ 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 = -1) = 0;
+  virtual bool Initialize(const wxString& WXUNUSED(file), int WXUNUSED(server) ) { return FALSE; };
+  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;
 
   // If file is "", reloads file given  in Initialize
   virtual bool LoadFile(const wxString& file = "") = 0;


@@ -45,6 +52,6 @@ class WXDLLEXPORT wxHelpControllerBase: public wxObject
   virtual void OnQuit(void) {};
 };
 
   virtual void OnQuit(void) {};
 };
 

-#endif // USE_HELP
+#endif // wxUSE_HELP

 #endif
 #endif

-    // __HELPBASEH__
+    // _WX_HELPBASEH__