pragma fix for gcc

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

diff --git a/include/wx/generic/helpxlp.h b/include/wx/generic/helpxlp.h
index ec5aa7e1746ab3d9850aab90e3f592b9add733f7..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 wxUSE_HELP
 
 #include "wx/helpbase.h"
 
 #ifdef __WXMSW__
 
 #if wxUSE_HELP
 
 #include "wx/helpbase.h"
 
 #ifdef __WXMSW__

-#include "wx/dde.h"
+    #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;


@@ -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,6 +121,8 @@ 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 // wxUSE_HELP
 };
 
 #endif // wxUSE_HELP