X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/670f9935630beb2123a5ca62894ae92a3f0efa4f..64ea838d8f4d1853b7d850db93ee565e901d099a:/src/common/cshelp.cpp diff --git a/src/common/cshelp.cpp b/src/common/cshelp.cpp index 82f3383652..f0f72c147b 100644 --- a/src/common/cshelp.cpp +++ b/src/common/cshelp.cpp @@ -28,12 +28,17 @@ #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 + #include "wx/msw/helpchm.h" // for ShowContextHelpPopup + #include "wx/utils.h" // for wxGetMousePosition() +#endif + // ---------------------------------------------------------------------------- // wxContextHelpEvtHandler private class // ---------------------------------------------------------------------------- @@ -53,7 +58,7 @@ public: //// Data wxContextHelp* m_contextHelp; - DECLARE_NO_COPY_CLASS(wxContextHelpEvtHandler) + wxDECLARE_NO_COPY_CLASS(wxContextHelpEvtHandler); }; // ============================================================================ @@ -118,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; @@ -144,6 +149,10 @@ bool wxContextHelp::BeginContextHelp(wxWindow* win) win->SetCursor(oldCursor); +#ifdef __WXMAC__ + wxSetCursor(wxNullCursor); +#endif + if (m_status) { wxPoint pt; @@ -223,21 +232,13 @@ bool wxContextHelpEvtHandler::ProcessEvent(wxEvent& event) // Dispatch the help event to the relevant window bool wxContextHelp::DispatchEvent(wxWindow* win, const wxPoint& pt) { - wxWindow* subjectOfHelp = win; - bool eventProcessed = false; - while (subjectOfHelp && !eventProcessed) - { - wxHelpEvent helpEvent(wxEVT_HELP, subjectOfHelp->GetId(), pt) ; - helpEvent.SetEventObject(subjectOfHelp); + wxCHECK_MSG( win, false, wxT("win parameter can't be NULL") ); - eventProcessed = win->GetEventHandler()->ProcessEvent(helpEvent); + wxHelpEvent helpEvent(wxEVT_HELP, win->GetId(), pt, + wxHelpEvent::Origin_HelpButton); + helpEvent.SetEventObject(win); - // Go up the window hierarchy until the event is handled (or not). - // I.e. keep submitting ancestor windows until one is recognised - // by the app code that processes the ids and displays help. - subjectOfHelp = subjectOfHelp->GetParent(); - } - return eventProcessed; + return win->GetEventHandler()->ProcessEvent(helpEvent); } // ---------------------------------------------------------------------------- @@ -283,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 @@ -302,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 @@ -326,6 +327,25 @@ wxHelpProvider::~wxHelpProvider() { } +wxString wxHelpProvider::GetHelpTextMaybeAtPoint(wxWindowBase *window) +{ + if ( m_helptextAtPoint != wxDefaultPosition || + m_helptextOrigin != wxHelpEvent::Origin_Unknown ) + { + wxCHECK_MSG( window, wxEmptyString, wxT("window must not be NULL") ); + + wxPoint pt = m_helptextAtPoint; + wxHelpEvent::Origin origin = m_helptextOrigin; + + m_helptextAtPoint = wxDefaultPosition; + m_helptextOrigin = wxHelpEvent::Origin_Unknown; + + return window->GetHelpTextAtPoint(pt, origin); + } + + return GetHelp(window); +} + // ---------------------------------------------------------------------------- // wxSimpleHelpProvider // ---------------------------------------------------------------------------- @@ -367,28 +387,51 @@ void wxSimpleHelpProvider::RemoveHelp(wxWindowBase* window) bool wxSimpleHelpProvider::ShowHelp(wxWindowBase *window) { -#if wxUSE_TIPWINDOW - static wxTipWindow* s_tipWindow = NULL; +#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 - if (s_tipWindow) - { - // Prevent s_tipWindow being nulled in OnIdle, - // thereby removing the chance for the window to be closed by ShowHelp - s_tipWindow->SetTipWindowPtr(NULL); - s_tipWindow->Close(); - } - s_tipWindow = NULL; + const wxString text = GetHelpTextMaybeAtPoint(window); - wxString text = GetHelp(window); if ( !text.empty() ) { - s_tipWindow = new wxTipWindow((wxWindow *)window, text, 100, & s_tipWindow); + // use the native help popup style if it's available +#if wxUSE_MS_HTML_HELP + if ( !wxCHMHelpController::ShowContextHelpPopup + ( + text, + posTooltip, + (wxWindow *)window + ) ) +#endif // wxUSE_MS_HTML_HELP + { +#if wxUSE_TIPWINDOW + static wxTipWindow* s_tipWindow = NULL; + + if ( s_tipWindow ) + { + // Prevent s_tipWindow being nulled in OnIdle, thereby removing + // the chance for the window to be closed by ShowHelp + s_tipWindow->SetTipWindowPtr(NULL); + s_tipWindow->Close(); + } + + s_tipWindow = new wxTipWindow((wxWindow *)window, text, + 100, &s_tipWindow); +#else // !wxUSE_TIPWINDOW + // we tried wxCHMHelpController but it failed and we don't have + // wxTipWindow to fall back on, so + return false; +#endif // wxUSE_TIPWINDOW + } return true; } -#else +#else // !wxUSE_MS_HTML_HELP && !wxUSE_TIPWINDOW wxUnusedVar(window); -#endif // wxUSE_TIPWINDOW +#endif // wxUSE_MS_HTML_HELP || wxUSE_TIPWINDOW return false; } @@ -404,35 +447,32 @@ wxHelpControllerHelpProvider::wxHelpControllerHelpProvider(wxHelpControllerBase* bool wxHelpControllerHelpProvider::ShowHelp(wxWindowBase *window) { - wxString text = GetHelp(window); - if ( !text.empty() ) - { - if (m_helpController) - { - if (text.IsNumber()) - return m_helpController->DisplayContextPopup(wxAtoi(text)); + const wxString text = GetHelpTextMaybeAtPoint(window); - // If the help controller is capable of popping up the text... - else if (m_helpController->DisplayTextPopup(text, wxGetMousePosition())) - { - return true; - } - else - // ...else use the default method. - return wxSimpleHelpProvider::ShowHelp(window); - } - else - return wxSimpleHelpProvider::ShowHelp(window); + if ( text.empty() ) + return false; + if ( m_helpController ) + { + // if it's a numeric topic, show it + long topic; + if ( text.ToLong(&topic) ) + return m_helpController->DisplayContextPopup(topic); + + // otherwise show the text directly + if ( m_helpController->DisplayTextPopup(text, wxGetMousePosition()) ) + return true; } - return false; + // if there is no help controller or it's not capable of showing the help, + // fallback to the default method + return wxSimpleHelpProvider::ShowHelp(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); } // ----------------------------------------------------------------------------