From 27f213184e9a24be4b761981aec911e3a605d4f5 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 29 Feb 2008 23:54:16 +0000 Subject: [PATCH] really use the position passed to ShowHelpAtPoint() when using CHM help controller (we always used the mouse position instead) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52203 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/cshelp.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/common/cshelp.cpp b/src/common/cshelp.cpp index cfce45d48d..4a02253a00 100644 --- a/src/common/cshelp.cpp +++ b/src/common/cshelp.cpp @@ -388,6 +388,11 @@ void wxSimpleHelpProvider::RemoveHelp(wxWindowBase* window) bool wxSimpleHelpProvider::ShowHelp(wxWindowBase *window) { #if wxUSE_MS_HTML_HELP || wxUSE_TIPWINDOW +#if wxUSE_MS_HTML_HELP + // m_helptextAtPoint will be reset by GetHelpTextMaybeAtPoint(), stash it + const wxPoint posTooltip = m_helptextAtPoint; +#endif // wxUSE_MS_HTML_HELP + const wxString text = GetHelpTextMaybeAtPoint(window); if ( !text.empty() ) @@ -397,7 +402,7 @@ bool wxSimpleHelpProvider::ShowHelp(wxWindowBase *window) if ( !wxCHMHelpController::ShowContextHelpPopup ( text, - wxGetMousePosition(), + posTooltip, (wxWindow *)window ) ) #endif // wxUSE_MS_HTML_HELP -- 2.47.2