X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ba8c1601448fa16d64c4e75a095f1cb037909c5b..05c3f0fc73d9124061c08e3d707b4e3d6bab4ff4:/include/wx/cshelp.h diff --git a/include/wx/cshelp.h b/include/wx/cshelp.h index 99169934b1..9780189ffe 100644 --- a/include/wx/cshelp.h +++ b/include/wx/cshelp.h @@ -6,13 +6,13 @@ // 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__) +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "cshelp.h" #endif @@ -41,7 +41,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 +54,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) @@ -79,7 +79,7 @@ public: void OnContextHelp(wxCommandEvent& event); private: - DECLARE_CLASS(wxContextHelpButton) + DECLARE_DYNAMIC_CLASS_NO_COPY(wxContextHelpButton) DECLARE_EVENT_TABLE() }; @@ -117,7 +117,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 +141,8 @@ private: static wxHelpProvider *ms_helpProvider; }; -WX_DECLARE_HASH_MAP( long, wxString, wxIntegerHash, wxIntegerEqual, - wxLongToStringHashMap ); +WX_DECLARE_EXPORTED_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