X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/23645bfa01b6450257f140a30c87565225b1ef4a..222702b112dcc7bebe018d6f4d66fe469fefd02c:/src/univ/inpcons.cpp diff --git a/src/univ/inpcons.cpp b/src/univ/inpcons.cpp index 7844f2d044..793efab2fe 100644 --- a/src/univ/inpcons.cpp +++ b/src/univ/inpcons.cpp @@ -6,14 +6,14 @@ // Created: 14.08.00 // RCS-ID: $Id$ // Copyright: (c) 2000 SciTech Software, Inc. (www.scitechsoft.com) -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// // ============================================================================ // 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; @@ -99,10 +100,10 @@ void wxInputConsumer::OnMouse(wxMouseEvent& event) // the actions // ---------------------------------------------------------------------------- -bool wxInputConsumer::PerformAction(const wxControlAction& action, - long numArg, - const wxString& strArg) +bool wxInputConsumer::PerformAction(const wxControlAction& WXUNUSED(action), + long WXUNUSED(numArg), + const wxString& WXUNUSED(strArg)) { - return FALSE; + return false; }