X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c801d85f158c4cba50b588807daabdcbd0ed3853..470caaf9df1fe6796e6efc7ec17b627bb0180aff:/include/wx/generic/helpxlp.h?ds=sidebyside

diff --git a/include/wx/generic/helpxlp.h b/include/wx/generic/helpxlp.h
index 80587b3d07..823b5b936f 100644
--- a/include/wx/generic/helpxlp.h
+++ b/include/wx/generic/helpxlp.h
@@ -6,11 +6,9 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:   	wxWindows license
+// Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
-/* sccsid[] = "@(#)wx_help.h	1.2 5/9/94" */
-
 #ifndef __HELPXLPH__
 #define __HELPXLPH__
 
@@ -21,15 +19,14 @@
 #include <stdio.h>
 #include "wx/wx.h"
 
-#if USE_HELP
+#if wxUSE_HELP
 
 #include "wx/helpbase.h"
 
-#ifdef __WINDOWS__
-#include "wx/dde.h"
+#ifdef __WXMSW__
+    #include "wx/dde.h"
 #else
-// Or whatever it'll be called
-#include "wx/ipctcp.h"
+    #include "wx/sckipc.h"
 #endif
 
 class WXDLLEXPORT wxXLPHelpController;
@@ -38,7 +35,7 @@ class WXDLLEXPORT wxXLPHelpController;
 // wxHelp process and the application
 class WXDLLEXPORT wxXLPHelpConnection: public
 
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
  wxDDEConnection
 #else
  wxTCPConnection
@@ -62,7 +59,7 @@ class WXDLLEXPORT wxXLPHelpConnection: public
 // controlling the wxHelp process
 class WXDLLEXPORT wxXLPHelpClient: public
 
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
  wxDDEClient
 #else
  wxTCPClient
@@ -120,8 +117,10 @@ class WXDLLEXPORT wxXLPHelpController: public wxHelpControllerBase
   bool					helpRunning;
   wxXLPHelpConnection*	helpConnection;
   wxXLPHelpClient		helpClient;
+private:
+  virtual bool Initialize(const wxString& file) { return(wxHelpControllerBase::Initialize(file)); };
 };
 
-#endif // USE_HELP
+#endif // wxUSE_HELP
 #endif
     // __HELPXLPH__