Support for automatic setup.h in OS/2 with OW builds. __WXOS2__ final removal. Source...

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

diff --git a/include/wx/cshelp.h b/include/wx/cshelp.h
index 9780189ffe633083a560fc16c9b32a6142fdbe8b..7f85910dd7c1f9fcc088c5c3c9786af0b657e6b8 100644 (file)
--- a/include/wx/cshelp.h
+++ b/include/wx/cshelp.h
@@ -12,10 +12,6 @@
 #ifndef _WX_CSHELPH__
 #define _WX_CSHELPH__
 
 #ifndef _WX_CSHELPH__
 #define _WX_CSHELPH__
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "cshelp.h"
-#endif
-

 #include "wx/defs.h"
 
 #if wxUSE_HELP
 #include "wx/defs.h"
 
 #if wxUSE_HELP


@@ -141,8 +137,8 @@ private:
     static wxHelpProvider *ms_helpProvider;
 };
 
     static wxHelpProvider *ms_helpProvider;
 };
 

-WX_DECLARE_EXPORTED_HASH_MAP( long, wxString, wxIntegerHash, wxIntegerEqual,
-                              wxLongToStringHashMap );
+WX_DECLARE_EXPORTED_HASH_MAP( wxUIntPtr, wxString, wxIntegerHash,
+                              wxIntegerEqual, wxSimpleHelpProviderHashMap );

 
 // wxSimpleHelpProvider is an implementation of wxHelpProvider which supports
 // only plain text help strings and shows the string associated with the
 
 // wxSimpleHelpProvider is an implementation of wxHelpProvider which supports
 // only plain text help strings and shows the string associated with the


@@ -160,8 +156,8 @@ public:
 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

-    wxLongToStringHashMap m_hashWindows,
-                          m_hashIds;
+    wxSimpleHelpProviderHashMap m_hashWindows,
+                                m_hashIds;

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