[ 1216436 ] cleanup 'shadow variable' warnings from gcc in headers.

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

diff --git a/src/univ/inpcons.cpp b/src/univ/inpcons.cpp
index af38f0c8eb7e5289d270bb77199de10f8d3baaff..793efab2fe6bb38b034e81d409ffa5dfc0d49b87 100644 (file)
--- a/src/univ/inpcons.cpp
+++ b/src/univ/inpcons.cpp
@@ -66,13 +66,13 @@ void wxInputConsumer::CreateInputHandler(const wxString& inphandler)
 
 void wxInputConsumer::OnKeyDown(wxKeyEvent& event)
 {
 
 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)
 {
         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();
 }
 
         event.Skip();
 }
 


@@ -80,7 +80,8 @@ void wxInputConsumer::OnMouse(wxMouseEvent& event)
 {
     if ( m_inputHandler )
     {
 {
     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;
         {
             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))
 {
                                     long WXUNUSED(numArg),
                                     const wxString& WXUNUSED(strArg))
 {

-    return FALSE;
+    return false;

 }
 
 }