X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..8930b2ed1ebff50797843db75744c6963287dbe7:/src/univ/inpcons.cpp

diff --git a/src/univ/inpcons.cpp b/src/univ/inpcons.cpp
index f6e1d1be6a..34743eff77 100644
--- a/src/univ/inpcons.cpp
+++ b/src/univ/inpcons.cpp
@@ -6,17 +6,13 @@
 // Created:     14.08.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 // declarations
 // ============================================================================
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "inpcons.h"
-#endif
-
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
@@ -59,20 +55,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 +82,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 +106,6 @@ bool wxInputConsumer::PerformAction(const wxControlAction& WXUNUSED(action),
                                     long WXUNUSED(numArg),
                                     const wxString& WXUNUSED(strArg))
 {
-    return FALSE;
+    return false;
 }