Small changes after Robert's edits

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

diff --git a/include/wx/helpbase.h b/include/wx/helpbase.h
index 24557948d1654a1a8b751ab23cf2277b479feb48..b1ee1c693b603d90813142f85c58d33027b2715c 100644 (file)
--- 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"
@@ -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;
@@ -47,4 +48,4 @@ class WXDLLEXPORT wxHelpControllerBase: public wxObject
 
 #endif // USE_HELP
 #endif
-    // __HELPBASEH__
+    // _WX_HELPBASEH__