opaque toolbox structs under Classic break access to contrlDefProc

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

diff --git a/include/wx/cshelp.h b/include/wx/cshelp.h
index 3b8cae26cce0c6f91f604d500152b4029b1ad2ea..d72a3d92547e0307a98048e2605b7647c61345f4 100644 (file)
--- a/include/wx/cshelp.h
+++ b/include/wx/cshelp.h
@@ -17,10 +17,10 @@
 #endif
 
 #include "wx/defs.h"
-#include "wx/help.h"
 
 #if wxUSE_HELP
 
+#include "wx/help.h"
 #include "wx/bmpbuttn.h"
 
 // ----------------------------------------------------------------------------
@@ -78,8 +78,6 @@ private:
     DECLARE_EVENT_TABLE()
 };
 
-#endif // wxUSE_HELP
-
 // ----------------------------------------------------------------------------
 // classes used to implement context help support
 // ----------------------------------------------------------------------------
@@ -126,6 +124,9 @@ public:
     // 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();
 
@@ -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 void RemoveHelp(wxWindowBase* window);
 
 protected:
     // we use 2 hashes for storing the help strings associated with windows
@@ -175,7 +177,9 @@ protected:
 };
 
 // Convenience function for turning context id into wxString
-wxString wxContextId(int id);
+WXDLLEXPORT wxString wxContextId(int id);
+
+#endif // wxUSE_HELP
 
 #endif // _WX_CSHELPH__