Applied patch [ 1381895 ] remove circular include dependendcy in wxchar.h

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

diff --git a/include/wx/cshelp.h b/include/wx/cshelp.h
index 2da0ddd5b5014718f4cf6f1ca338063ea7482299..3f713a9a39a6a80f72a8b4d7aeba3c1716688e6d 100644 (file)
--- a/include/wx/cshelp.h
+++ b/include/wx/cshelp.h
@@ -6,16 +6,12 @@
 // Created:     08/09/2000
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 Julian Smart, Vadim Zeitlin
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CSHELPH__
 #define _WX_CSHELPH__
 
-#if defined(__GNUG__) && !defined(__APPLE__)
-    #pragma interface "cshelp.h"
-#endif
-
 #include "wx/defs.h"
 
 #if wxUSE_HELP
@@ -41,7 +37,7 @@
 class WXDLLEXPORT wxContextHelp : public wxObject
 {
 public:
-    wxContextHelp(wxWindow* win = NULL, bool beginHelp = TRUE);
+    wxContextHelp(wxWindow* win = NULL, bool beginHelp = true);
     virtual ~wxContextHelp();
 
     bool BeginContextHelp(wxWindow* win);
@@ -54,7 +50,7 @@ public:
 
 protected:
     bool    m_inHelp;
-    bool    m_status; // TRUE if the user left-clicked
+    bool    m_status; // true if the user left-clicked
 
 private:
     DECLARE_DYNAMIC_CLASS(wxContextHelp)
@@ -117,7 +113,7 @@ public:
     virtual wxString GetHelp(const wxWindowBase *window) = 0;
 
     // do show help for the given window (uses GetHelp() internally if
-    // applicable), return TRUE if it was done or FALSE if no help available
+    // applicable), return true if it was done or false if no help available
     // for this window
     virtual bool ShowHelp(wxWindowBase *window) = 0;
 
@@ -141,8 +137,8 @@ private:
     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
@@ -160,8 +156,8 @@ public:
 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