]> git.saurik.com Git - wxWidgets.git/blobdiff - include/wx/cshelp.h
support SDK < 10.6, fixes #14902
[wxWidgets.git] / include / wx / cshelp.h
index a165ab220eafe7d850b062677462469594935925..87e0dbd1378c7c783c902918579bb090a799efd3 100644 (file)
@@ -134,7 +134,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 +217,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 +232,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