Changes to allow OLE to compile under mingw32/gcc-2.95

[wxWidgets.git] / include / wx / msw / helpwin.h

diff --git a/include/wx/msw/helpwin.h b/include/wx/msw/helpwin.h
index 01b2eecf053bd8bc596c2fb08b91502450d07133..308439b8b3067f2dd7f36f557297aa7d9c452046 100644 (file)
--- a/include/wx/msw/helpwin.h
+++ b/include/wx/msw/helpwin.h
@@ -5,12 +5,12 @@
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:    wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __HELPWINH__
-#define __HELPWINH__
+#ifndef _WX_HELPWIN_H_
+#define _WX_HELPWIN_H_
 
 #ifdef __GNUG__
 #pragma interface "helpwin.h"
@@ -18,7 +18,7 @@
 
 #include "wx/wx.h"
 
-#if USE_HELP
+#if wxUSE_HELP
 
 #include "wx/helpbase.h"
 
@@ -31,7 +31,7 @@ class WXDLLEXPORT wxWinHelpController: public wxHelpControllerBase
   ~wxWinHelpController(void);
 
   // Must call this to set the filename and server name
-  virtual bool Initialize(const wxString& file, int server = -1);
+  virtual bool Initialize(const wxString& file);
 
   // If file is "", reloads file given  in Initialize
   virtual bool LoadFile(const wxString& file = "");
@@ -49,6 +49,6 @@ protected:
   wxString m_helpFile;
 };
 
-#endif // USE_HELP
+#endif // wxUSE_HELP
 #endif
-    // __HELPWINH__
+    // _WX_HELPWIN_H_