added __WXBASE__ define; removed duplicated (in wx/chkconf.h) compatibility section

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

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

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

     #pragma interface "cshelp.h"
 #endif
 
     #pragma interface "cshelp.h"
 #endif
 


@@ -124,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();
 


@@ -142,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


@@ -170,6 +174,8 @@ public:
 
 protected:
     wxHelpControllerBase*   m_helpController;
 
 protected:
     wxHelpControllerBase*   m_helpController;

+
+    DECLARE_NO_COPY_CLASS(wxHelpControllerHelpProvider)

 };
 
 // Convenience function for turning context id into wxString
 };
 
 // Convenience function for turning context id into wxString