X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..64ea838d8f4d1853b7d850db93ee565e901d099a:/src/univ/inpcons.cpp?ds=sidebyside diff --git a/src/univ/inpcons.cpp b/src/univ/inpcons.cpp index af38f0c8eb..7da3181e07 100644 --- a/src/univ/inpcons.cpp +++ b/src/univ/inpcons.cpp @@ -13,10 +13,6 @@ // declarations // ============================================================================ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "inpcons.h" -#endif - // ---------------------------------------------------------------------------- // headers // ---------------------------------------------------------------------------- @@ -27,6 +23,10 @@ #pragma hdrstop #endif +#ifndef WX_PRECOMP + #include "wx/window.h" +#endif // WX_PRECOMP + #include "wx/univ/renderer.h" #include "wx/univ/inphand.h" #include "wx/univ/theme.h" @@ -59,20 +59,26 @@ void wxInputConsumer::OnActivate(wxActivateEvent& event) // input processing // ---------------------------------------------------------------------------- +wxInputHandler * +wxInputConsumer::DoGetStdInputHandler(wxInputHandler * WXUNUSED(handlerDef)) +{ + return NULL; +} + void wxInputConsumer::CreateInputHandler(const wxString& inphandler) { - m_inputHandler = wxTheme::Get()->GetInputHandler(inphandler); + m_inputHandler = wxTheme::Get()->GetInputHandler(inphandler, this); } void wxInputConsumer::OnKeyDown(wxKeyEvent& event) { - if ( !m_inputHandler || !m_inputHandler->HandleKey(this, event, TRUE) ) + if ( !m_inputHandler || !m_inputHandler->HandleKey(this, event, true) ) event.Skip(); } void wxInputConsumer::OnKeyUp(wxKeyEvent& event) { - if ( !m_inputHandler || !m_inputHandler->HandleKey(this, event, FALSE) ) + if ( !m_inputHandler || !m_inputHandler->HandleKey(this, event, false) ) event.Skip(); } @@ -80,7 +86,8 @@ void wxInputConsumer::OnMouse(wxMouseEvent& event) { if ( m_inputHandler ) { - if ( event.Moving() || event.Entering() || event.Leaving() ) + if ( event.Moving() || event.Dragging() || + event.Entering() || event.Leaving() ) { if ( m_inputHandler->HandleMouseMove(this, event) ) return; @@ -103,6 +110,5 @@ bool wxInputConsumer::PerformAction(const wxControlAction& WXUNUSED(action), long WXUNUSED(numArg), const wxString& WXUNUSED(strArg)) { - return FALSE; + return false; } -