Make storing non-trivial data in wxThreadSpecificInfo possible.

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

diff --git a/include/wx/cshelp.h b/include/wx/cshelp.h
index e80c2d0ab48b1892682ae62883bd4a8d6c97f660..723ac14e0acf1c73ded1c2f666017eb8f0e8fbc9 100644 (file)
--- a/include/wx/cshelp.h
+++ b/include/wx/cshelp.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart, Vadim Zeitlin
 // Modified by:
 // Created:     08/09/2000
-// RCS-ID:      $Id$
 // Copyright:   (c) 2000 Julian Smart, Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -36,7 +35,7 @@
  * window for the application to display help for.
  */
 
-class WXDLLEXPORT wxContextHelp : public wxObject
+class WXDLLIMPEXP_CORE wxContextHelp : public wxObject
 {
 public:
     wxContextHelp(wxWindow* win = NULL, bool beginHelp = true);
@@ -65,7 +64,7 @@ private:
  * to put the application into context help mode.
  */
 
-class WXDLLEXPORT wxContextHelpButton : public wxBitmapButton
+class WXDLLIMPEXP_CORE wxContextHelpButton : public wxBitmapButton
 {
 public:
     wxContextHelpButton(wxWindow* parent,
@@ -106,7 +105,7 @@ private:
 // and overriding ShowHelp() but calling the base class version wouldn't work
 // any more, which forces us to use a rather ugly hack and pass the extra
 // parameters of ShowHelpAtPoint() to ShowHelp() via member variables.
-class WXDLLEXPORT wxHelpProvider
+class WXDLLIMPEXP_CORE wxHelpProvider
 {
 public:
     // get/set the current (application-global) help provider (Set() returns
@@ -134,7 +133,7 @@ public:
                                  const wxPoint& pt,
                                  wxHelpEvent::Origin origin)
     {
-        wxCHECK_MSG( window, false, _T("window must not be NULL") );
+        wxCHECK_MSG( window, false, wxT("window must not be NULL") );
 
         m_helptextAtPoint = pt;
         m_helptextOrigin = origin;
@@ -188,7 +187,7 @@ WX_DECLARE_EXPORTED_HASH_MAP( wxUIntPtr, wxString, wxIntegerHash,
 // 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
-class WXDLLEXPORT wxSimpleHelpProvider : public wxHelpProvider
+class WXDLLIMPEXP_CORE wxSimpleHelpProvider : public wxHelpProvider
 {
 public:
     // implement wxHelpProvider methods
@@ -212,12 +211,12 @@ protected:
 // both context identifiers and plain text help strings. If the help text is an integer,
 // it is passed to wxHelpController::DisplayContextPopup. Otherwise, it shows the string
 // in a tooltip as per wxSimpleHelpProvider.
-class WXDLLEXPORT wxHelpControllerHelpProvider : public wxSimpleHelpProvider
+class WXDLLIMPEXP_CORE wxHelpControllerHelpProvider : public wxSimpleHelpProvider
 {
 public:
     // Note that it doesn't own the help controller. The help controller
     // should be deleted separately.
-    wxHelpControllerHelpProvider(wxHelpControllerBase* hc = (wxHelpControllerBase*) NULL);
+    wxHelpControllerHelpProvider(wxHelpControllerBase* hc = NULL);
 
     // implement wxHelpProvider methods
 
@@ -232,11 +231,11 @@ public:
 protected:
     wxHelpControllerBase*   m_helpController;
 
-    DECLARE_NO_COPY_CLASS(wxHelpControllerHelpProvider)
+    wxDECLARE_NO_COPY_CLASS(wxHelpControllerHelpProvider);
 };
 
 // Convenience function for turning context id into wxString
-WXDLLEXPORT wxString wxContextId(int id);
+WXDLLIMPEXP_CORE wxString wxContextId(int id);
 
 #endif // wxUSE_HELP