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 a165ab220eafe7d850b062677462469594935925..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
 // Author:      Julian Smart, Vadim Zeitlin
 // Modified by:
 // Created:     08/09/2000

-// RCS-ID:      $Id$

 // Copyright:   (c) 2000 Julian Smart, Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2000 Julian Smart, Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -134,7 +133,7 @@ public:
                                  const wxPoint& pt,
                                  wxHelpEvent::Origin origin)
     {
                                  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;
 
         m_helptextAtPoint = pt;
         m_helptextOrigin = origin;


@@ -217,7 +216,7 @@ class WXDLLIMPEXP_CORE wxHelpControllerHelpProvider : public wxSimpleHelpProvide
 public:
     // Note that it doesn't own the help controller. The help controller
     // should be deleted separately.
 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
 
 
     // implement wxHelpProvider methods
 


@@ -232,7 +231,7 @@ public:
 protected:
     wxHelpControllerBase*   m_helpController;
 
 protected:
     wxHelpControllerBase*   m_helpController;
 

-    DECLARE_NO_COPY_CLASS(wxHelpControllerHelpProvider)
+    wxDECLARE_NO_COPY_CLASS(wxHelpControllerHelpProvider);

 };
 
 // Convenience function for turning context id into wxString
 };
 
 // Convenience function for turning context id into wxString