X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/392c5133ff8aba785fece7aef8f63f99843e8aa1..08670ea85abf4b4946a9ce64971b591d7b1ee30b:/src/common/cshelp.cpp?ds=inline diff --git a/src/common/cshelp.cpp b/src/common/cshelp.cpp index ec7ec40de0..f0f72c147b 100644 --- a/src/common/cshelp.cpp +++ b/src/common/cshelp.cpp @@ -28,10 +28,10 @@ #ifndef WX_PRECOMP #include "wx/app.h" + #include "wx/module.h" #endif #include "wx/tipwin.h" -#include "wx/module.h" #include "wx/cshelp.h" #if wxUSE_MS_HTML_HELP @@ -58,7 +58,7 @@ public: //// Data wxContextHelp* m_contextHelp; - DECLARE_NO_COPY_CLASS(wxContextHelpEvtHandler) + wxDECLARE_NO_COPY_CLASS(wxContextHelpEvtHandler); }; // ============================================================================ @@ -123,8 +123,8 @@ bool wxContextHelp::BeginContextHelp(wxWindow* win) wxCursor oldCursor = win->GetCursor(); win->SetCursor(cursor); -#ifdef __WXMSW__ - // wxSetCursor(cursor); +#ifdef __WXMAC__ + wxSetCursor(cursor); #endif m_status = false; @@ -149,6 +149,10 @@ bool wxContextHelp::BeginContextHelp(wxWindow* win) win->SetCursor(oldCursor); +#ifdef __WXMAC__ + wxSetCursor(wxNullCursor); +#endif + if (m_status) { wxPoint pt; @@ -228,7 +232,7 @@ bool wxContextHelpEvtHandler::ProcessEvent(wxEvent& event) // Dispatch the help event to the relevant window bool wxContextHelp::DispatchEvent(wxWindow* win, const wxPoint& pt) { - wxCHECK_MSG( win, false, _T("win parameter can't be NULL") ); + wxCHECK_MSG( win, false, wxT("win parameter can't be NULL") ); wxHelpEvent helpEvent(wxEVT_HELP, win->GetId(), pt, wxHelpEvent::Origin_HelpButton); @@ -280,7 +284,7 @@ wxContextHelpButton::wxContextHelpButton(wxWindow* parent, long style) #if defined(__WXPM__) : wxBitmapButton(parent, id, wxBitmap(wxCSQUERY_BITMAP - ,wxBITMAP_TYPE_RESOURCE + ,wxBITMAP_TYPE_BMP_RESOURCE ), pos, size, style) #else @@ -299,7 +303,7 @@ void wxContextHelpButton::OnContextHelp(wxCommandEvent& WXUNUSED(event)) // wxHelpProvider // ---------------------------------------------------------------------------- -wxHelpProvider *wxHelpProvider::ms_helpProvider = (wxHelpProvider *)NULL; +wxHelpProvider *wxHelpProvider::ms_helpProvider = NULL; // trivial implementation of some methods which we don't want to make pure // virtual for convenience @@ -328,7 +332,7 @@ wxString wxHelpProvider::GetHelpTextMaybeAtPoint(wxWindowBase *window) if ( m_helptextAtPoint != wxDefaultPosition || m_helptextOrigin != wxHelpEvent::Origin_Unknown ) { - wxCHECK_MSG( window, wxEmptyString, _T("window must not be NULL") ); + wxCHECK_MSG( window, wxEmptyString, wxT("window must not be NULL") ); wxPoint pt = m_helptextAtPoint; wxHelpEvent::Origin origin = m_helptextOrigin; @@ -384,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() ) @@ -393,7 +402,7 @@ bool wxSimpleHelpProvider::ShowHelp(wxWindowBase *window) if ( !wxCHMHelpController::ShowContextHelpPopup ( text, - wxGetMousePosition(), + posTooltip, (wxWindow *)window ) ) #endif // wxUSE_MS_HTML_HELP @@ -463,7 +472,7 @@ bool wxHelpControllerHelpProvider::ShowHelp(wxWindowBase *window) // Convenience function for turning context id into wxString wxString wxContextId(int id) { - return wxString::Format(_T("%d"), id); + return wxString::Format(wxT("%d"), id); } // ----------------------------------------------------------------------------