Added wxHelpControllerHelpProvider, added DisplayContextPopup, DisplayTextPopup

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

diff --git a/include/wx/generic/helpxlp.h b/include/wx/generic/helpxlp.h
index 5c0b26d257a0193c78e10ed5d4edc7edb5f6d7fd..2452d9291033f79a8f11290fcdf6295ee356b62e 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
-// 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 __WXMSW__
-#include "wx/dde.h"
+    #include "wx/dde.h"
 #else
-// Or whatever it'll be called
-#include "wx/ipctcp.h"
+    #include "wx/sckipc.h"
 #endif
 
 class WXDLLEXPORT wxXLPHelpController;
@@ -107,6 +104,11 @@ class WXDLLEXPORT wxXLPHelpController: public wxHelpControllerBase
   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);
 
@@ -120,8 +122,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__