Warning fix

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

diff --git a/src/univ/inpcons.cpp b/src/univ/inpcons.cpp
index 1dd3897c0b57c01e9997a9c378c5b204f3f0d084..793efab2fe6bb38b034e81d409ffa5dfc0d49b87 100644 (file)
--- a/src/univ/inpcons.cpp
+++ b/src/univ/inpcons.cpp
@@ -35,11 +35,6 @@
 // implementation
 // ============================================================================
 
-wxInputConsumer::wxInputConsumer()
-{
-    m_inputHandler = NULL;
-}
-
 // ----------------------------------------------------------------------------
 // focus/activation handling
 // ----------------------------------------------------------------------------
@@ -71,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();
 }
 
@@ -85,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;
@@ -108,6 +104,6 @@ bool wxInputConsumer::PerformAction(const wxControlAction& WXUNUSED(action),
                                     long WXUNUSED(numArg),
                                     const wxString& WXUNUSED(strArg))
 {
-    return FALSE;
+    return false;
 }