X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/173e8bbfb381073b502b74a89e8e666a7b293b9d..0adad2d72ffb322510e78ea366c58adbd1e8082e:/src/common/cshelp.cpp?ds=sidebyside diff --git a/src/common/cshelp.cpp b/src/common/cshelp.cpp index 3921a21c96..ba35623830 100644 --- a/src/common/cshelp.cpp +++ b/src/common/cshelp.cpp @@ -167,7 +167,7 @@ bool wxContextHelpEvtHandler::ProcessEvent(wxEvent& event) m_contextHelp->EndContextHelp(); return TRUE; } - + if ((event.GetEventType() == wxEVT_CHAR) || (event.GetEventType() == wxEVT_KEY_DOWN) || (event.GetEventType() == wxEVT_ACTIVATE) || @@ -177,14 +177,14 @@ bool wxContextHelpEvtHandler::ProcessEvent(wxEvent& event) m_contextHelp->EndContextHelp(); return TRUE; } - + if ((event.GetEventType() == wxEVT_PAINT) || (event.GetEventType() == wxEVT_ERASE_BACKGROUND)) { event.Skip(); return FALSE; } - + return TRUE; } @@ -198,7 +198,7 @@ bool wxContextHelp::DispatchEvent(wxWindow* win, const wxPoint& pt) wxHelpEvent helpEvent(wxEVT_HELP, subjectOfHelp->GetId(), pt) ; helpEvent.SetEventObject(this); eventProcessed = win->GetEventHandler()->ProcessEvent(helpEvent); - + // 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. @@ -251,7 +251,7 @@ wxContextHelpButton::wxContextHelpButton(wxWindow* parent, { } -void wxContextHelpButton::OnContextHelp(wxCommandEvent& event) +void wxContextHelpButton::OnContextHelp(wxCommandEvent& WXUNUSED(event)) { wxContextHelp contextHelp(GetParent()); } @@ -305,6 +305,7 @@ void wxSimpleHelpProvider::AddHelp(wxWindowID id, const wxString& text) bool wxSimpleHelpProvider::ShowHelp(wxWindowBase *window) { +#if wxUSE_TIPWINDOW static wxTipWindow* s_tipWindow = NULL; if (s_tipWindow) @@ -323,6 +324,7 @@ bool wxSimpleHelpProvider::ShowHelp(wxWindowBase *window) return TRUE; } +#endif // wxUSE_TIPWINDOW return FALSE; }