X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/53a2db124c633f80bdb16336084262037d879a2c..a7689c49fe02c0c065facf736ab28b19f5997b7c:/include/wx/msw/helpchm.h?ds=sidebyside diff --git a/include/wx/msw/helpchm.h b/include/wx/msw/helpchm.h index 341a07f0fe..8d139155b0 100644 --- 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: @@ -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(WXWPARAM, param)); + return CallHtmlHelp(win, str, cmd, reinterpret_cast(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(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