compilation fixes

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

diff --git a/include/wx/cshelp.h b/include/wx/cshelp.h
index 7f2e61b62bce6058d9945fa2b3bc286ec8a9b1ce..31d6e205c309a7bdd37792dd1c197167466e0b00 100644 (file)
--- a/include/wx/cshelp.h
+++ b/include/wx/cshelp.h
@@ -12,16 +12,20 @@
 #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/hashmap.h"
+#if wxUSE_BMPBUTTON

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

+#endif

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


@@ -56,6 +60,7 @@ private:
     DECLARE_DYNAMIC_CLASS(wxContextHelp)
 };
 
     DECLARE_DYNAMIC_CLASS(wxContextHelp)
 };
 

+#if wxUSE_BMPBUTTON

 /*
  * wxContextHelpButton
  * You can add this to your dialogs (especially on non-Windows platforms)
 /*
  * wxContextHelpButton
  * You can add this to your dialogs (especially on non-Windows platforms)


@@ -74,11 +79,11 @@ public:
     void OnContextHelp(wxCommandEvent& event);
 
 private:
     void OnContextHelp(wxCommandEvent& event);
 
 private:

-    DECLARE_CLASS(wxContextHelpButton)
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxContextHelpButton)

     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 

-#endif // wxUSE_HELP
+#endif

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


@@ -126,6 +131,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();
 


@@ -133,6 +141,9 @@ private:
     static wxHelpProvider *ms_helpProvider;
 };
 
     static wxHelpProvider *ms_helpProvider;
 };
 

+WX_DECLARE_HASH_MAP( long, wxString, wxIntegerHash, wxIntegerEqual,
+                     wxLongToStringHashMap );
+

 // wxSimpleHelpProvider is an implementation of wxHelpProvider which supports
 // only plain text help strings and shows the string associated with the
 // control (if any) in a tooltip
 // wxSimpleHelpProvider is an implementation of wxHelpProvider which supports
 // only plain text help strings and shows the string associated with the
 // control (if any) in a tooltip


@@ -144,12 +155,13 @@ 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
     // and the ids
 
 protected:
     // we use 2 hashes for storing the help strings associated with windows
     // and the ids

-    wxStringHashTable m_hashWindows,
-                     m_hashIds;
+    wxLongToStringHashMap m_hashWindows,
+                          m_hashIds;

 };
 
 // wxHelpControllerHelpProvider is an implementation of wxHelpProvider which supports
 };
 
 // wxHelpControllerHelpProvider is an implementation of wxHelpProvider which supports


@@ -172,10 +184,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__