Applied rowspan patch #15276 (dghart)

[wxWidgets.git] / include / wx / msw / helpchm.h

diff --git a/include/wx/msw/helpchm.h b/include/wx/msw/helpchm.h
index 8702c276a26926c6121767cb8d185bd06cf43ed3..8d139155b0894106e22f62546751b6271354461f 100644 (file)
--- a/include/wx/msw/helpchm.h
+++ b/include/wx/msw/helpchm.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        helpchm.h
+// Name:        wx/msw/helpchm.h
 // Purpose:     Help system: MS HTML Help implementation
 // Author:      Julian Smart
 // Modified by:
@@ -16,7 +16,7 @@
 
 #include "wx/helpbase.h"
 
-class WXDLLEXPORT wxCHMHelpController : public wxHelpControllerBase
+class WXDLLIMPEXP_CORE wxCHMHelpController : public wxHelpControllerBase
 {
 public:
     wxCHMHelpController(wxWindow* parentWindow = NULL): wxHelpControllerBase(parentWindow) { }
@@ -56,20 +56,20 @@ protected:
     static bool CallHtmlHelp(wxWindow *win, const wxChar *str,
                              unsigned cmd, const void *param = NULL)
     {
-        return CallHtmlHelp(win, str, cmd, wx_reinterpret_cast(WPARAM, param));
+        return CallHtmlHelp(win, str, cmd, reinterpret_cast<WXWPARAM>(param));
     }
 
     // even simpler wrappers using GetParentWindow() and GetValidFilename() as
     // the first 2 HtmlHelp() parameters
     bool CallHtmlHelp(unsigned cmd, WXWPARAM param)
     {
-        return CallHtmlHelp(GetParentWindow(), GetValidFilename().wx_str(),
+        return CallHtmlHelp(GetParentWindow(), GetValidFilename().t_str(),
                             cmd, param);
     }
 
     bool CallHtmlHelp(unsigned cmd, const void *param = NULL)
     {
-        return CallHtmlHelp(cmd, wx_reinterpret_cast(WXWPARAM, param));
+        return CallHtmlHelp(cmd, reinterpret_cast<WXWPARAM>(param));
     }
 
     // wrapper around CallHtmlHelp(HH_DISPLAY_TEXT_POPUP): only one of text and
@@ -82,7 +82,7 @@ protected:
 
     wxString m_helpFile;
 
-    DECLARE_CLASS(wxCHMHelpController)
+    DECLARE_DYNAMIC_CLASS(wxCHMHelpController)
 };
 
 #endif // wxUSE_MS_HTML_HELP