X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0016bb3b1c6870a3c43b42b5be145c15fab56580..1f0acb435592470b421b80df854fbbb08cd2853f:/include/wx/msw/helpchm.h?ds=sidebyside diff --git a/include/wx/msw/helpchm.h b/include/wx/msw/helpchm.h index 8702c276a2..13d062de38 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: @@ -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,7 +56,7 @@ 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(param)); } // even simpler wrappers using GetParentWindow() and GetValidFilename() as @@ -69,7 +69,7 @@ protected: 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