X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/61fef19b852d426f5b00b60de083539b9ba0f76c..894d74dcc233b7f9a936767558f3e061593dd062:/src/univ/inpcons.cpp diff --git a/src/univ/inpcons.cpp b/src/univ/inpcons.cpp index 8fb83fff49..793efab2fe 100644 --- a/src/univ/inpcons.cpp +++ b/src/univ/inpcons.cpp @@ -13,7 +13,7 @@ // declarations // ============================================================================ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "inpcons.h" #endif @@ -66,13 +66,13 @@ void wxInputConsumer::CreateInputHandler(const wxString& inphandler) 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 +80,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 +104,6 @@ bool wxInputConsumer::PerformAction(const wxControlAction& WXUNUSED(action), long WXUNUSED(numArg), const wxString& WXUNUSED(strArg)) { - return FALSE; + return false; }