doubleclick selects word

[wxWidgets.git] / include / wx / cshelp.h

diff --git a/include/wx/cshelp.h b/include/wx/cshelp.h
index 7f2e61b62bce6058d9945fa2b3bc286ec8a9b1ce..4b0b75c53b77a459b98b846d5a23f119eab77bd0 100644 (file)
--- a/include/wx/cshelp.h
+++ b/include/wx/cshelp.h
@@ -12,15 +12,15 @@
 #ifndef _WX_CSHELPH__
 #define _WX_CSHELPH__
 
 #ifndef _WX_CSHELPH__
 #define _WX_CSHELPH__
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

     #pragma interface "cshelp.h"
 #endif
 
 #include "wx/defs.h"
     #pragma interface "cshelp.h"
 #endif
 
 #include "wx/defs.h"

-#include "wx/help.h"

 
 #if wxUSE_HELP
 
 
 #if wxUSE_HELP
 

+#include "wx/help.h"

 #include "wx/bmpbuttn.h"
 
 // ----------------------------------------------------------------------------
 #include "wx/bmpbuttn.h"
 
 // ----------------------------------------------------------------------------


@@ -78,8 +78,6 @@ private:
     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 

-#endif // wxUSE_HELP
-

 // ----------------------------------------------------------------------------
 // classes used to implement context help support
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // classes used to implement context help support
 // ----------------------------------------------------------------------------


@@ -126,6 +124,9 @@ public:
     // the application, for example)
     virtual void AddHelp(wxWindowID id, const wxString& text);
 
     // the application, for example)
     virtual void AddHelp(wxWindowID id, const wxString& text);
 

+    // removes the association
+    virtual void RemoveHelp(wxWindowBase* window);
+

     // virtual dtor for any base class
     virtual ~wxHelpProvider();
 
     // virtual dtor for any base class
     virtual ~wxHelpProvider();
 


@@ -144,6 +145,7 @@ public:
     virtual bool ShowHelp(wxWindowBase *window);
     virtual void AddHelp(wxWindowBase *window, const wxString& text);
     virtual void AddHelp(wxWindowID id, const wxString& text);
     virtual bool ShowHelp(wxWindowBase *window);
     virtual void AddHelp(wxWindowBase *window, const wxString& text);
     virtual void AddHelp(wxWindowID id, const wxString& text);

+    virtual void RemoveHelp(wxWindowBase* window);

 
 protected:
     // we use 2 hashes for storing the help strings associated with windows
 
 protected:
     // we use 2 hashes for storing the help strings associated with windows


@@ -172,10 +174,14 @@ public:
 
 protected:
     wxHelpControllerBase*   m_helpController;
 
 protected:
     wxHelpControllerBase*   m_helpController;

+
+    DECLARE_NO_COPY_CLASS(wxHelpControllerHelpProvider)

 };
 
 // Convenience function for turning context id into wxString
 WXDLLEXPORT wxString wxContextId(int id);
 
 };
 
 // Convenience function for turning context id into wxString
 WXDLLEXPORT wxString wxContextId(int id);
 

+#endif // wxUSE_HELP
+

 #endif // _WX_CSHELPH__
 
 #endif // _WX_CSHELPH__