X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c801d85f158c4cba50b588807daabdcbd0ed3853..e0a09ce41962009495be1f25c6c9f5e5ec11be18:/include/wx/helpbase.h

diff --git a/include/wx/helpbase.h b/include/wx/helpbase.h
index 24557948d1..ee38db1f10 100644
--- a/include/wx/helpbase.h
+++ b/include/wx/helpbase.h
@@ -9,8 +9,8 @@
 // Licence:   	wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __HELPBASEH__
-#define __HELPBASEH__
+#ifndef _WX_HELPBASEH__
+#define _WX_HELPBASEH__
 
 #ifdef __GNUG__
 #pragma interface "helpbase.h"
@@ -18,7 +18,7 @@
 
 #include "wx/wx.h"
 
-#if USE_HELP
+#if wxUSE_HELP
 
 // Defines the API for help controllers
 class WXDLLEXPORT wxHelpControllerBase: public wxObject
@@ -32,7 +32,8 @@ 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.
-  virtual bool Initialize(const wxString& file, int server = -1) = 0;
+  virtual bool Initialize(const wxString& file, int server) { return FALSE; };
+  virtual bool Initialize(const wxString& file) = 0;
 
   // If file is "", reloads file given  in Initialize
   virtual bool LoadFile(const wxString& file = "") = 0;
@@ -45,6 +46,6 @@ class WXDLLEXPORT wxHelpControllerBase: public wxObject
   virtual void OnQuit(void) {};
 };
 
-#endif // USE_HELP
+#endif // wxUSE_HELP
 #endif
-    // __HELPBASEH__
+    // _WX_HELPBASEH__