fixed a canonical example of Stupid Bug(tm)

[wxWidgets.git] / include / wx / generic / helpxlp.h

diff --git a/include/wx/generic/helpxlp.h b/include/wx/generic/helpxlp.h
index 80587b3d073052b41f690ff6f64e4fe7436bc6f0..ee074e7f2b3eee96609de9384da5a12a2b5cbc54 100644 (file)
--- 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
 // 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__
 
 #ifndef __HELPXLPH__
 #define __HELPXLPH__
 


@@ -18,18 +16,16 @@
 #pragma interface "helpxlp.h"
 #endif
 
 #pragma interface "helpxlp.h"
 #endif
 

-#include <stdio.h>
-#include "wx/wx.h"
+#include "wx/defs.h"

 
 

-#if USE_HELP
+#if wxUSE_HELP

 
 #include "wx/helpbase.h"
 
 
 #include "wx/helpbase.h"
 

-#ifdef __WINDOWS__
-#include "wx/dde.h"
+#ifdef __WXMSW__
+    #include "wx/dde.h"

 #else
 #else

-// Or whatever it'll be called
-#include "wx/ipctcp.h"
+    #include "wx/sckipc.h"

 #endif
 
 class WXDLLEXPORT wxXLPHelpController;
 #endif
 
 class WXDLLEXPORT wxXLPHelpController;


@@ -38,7 +34,7 @@ class WXDLLEXPORT wxXLPHelpController;
 // wxHelp process and the application
 class WXDLLEXPORT wxXLPHelpConnection: public
 
 // wxHelp process and the application
 class WXDLLEXPORT wxXLPHelpConnection: public
 

-#ifdef __WINDOWS__
+#ifdef __WXMSW__

  wxDDEConnection
 #else
  wxTCPConnection
  wxDDEConnection
 #else
  wxTCPConnection


@@ -62,7 +58,7 @@ class WXDLLEXPORT wxXLPHelpConnection: public
 // controlling the wxHelp process
 class WXDLLEXPORT wxXLPHelpClient: public
 
 // controlling the wxHelp process
 class WXDLLEXPORT wxXLPHelpClient: public
 

-#ifdef __WINDOWS__
+#ifdef __WXMSW__

  wxDDEClient
 #else
  wxTCPClient
  wxDDEClient
 #else
  wxTCPClient


@@ -107,6 +103,11 @@ class WXDLLEXPORT wxXLPHelpController: public wxHelpControllerBase
   virtual bool DisplayBlock(long blockNo);
   virtual bool KeywordSearch(const wxString& k);
 
   virtual bool DisplayBlock(long blockNo);
   virtual bool KeywordSearch(const wxString& k);
 

+  virtual bool DisplaySection(const wxString& section)
+  {
+      return wxHelpControllerBase::DisplaySection(section);
+  }
+

   virtual bool Quit(void);
   virtual void OnQuit(void);
 
   virtual bool Quit(void);
   virtual void OnQuit(void);
 


@@ -120,8 +121,10 @@ class WXDLLEXPORT wxXLPHelpController: public wxHelpControllerBase
   bool                                 helpRunning;
   wxXLPHelpConnection* helpConnection;
   wxXLPHelpClient              helpClient;
   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__
 #endif
     // __HELPXLPH__