compilation after last commit: semicolon after wxDELETE() is now required; also remov...

[wxWidgets.git] / src / univ / inpcons.cpp

diff --git a/src/univ/inpcons.cpp b/src/univ/inpcons.cpp
index af38f0c8eb7e5289d270bb77199de10f8d3baaff..7da3181e071ff90661ec23c3a1bc25c6136dc0ce 100644 (file)
--- 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;
 }
-