Applied patch [ 1341085 ] richtext xml build fix

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

diff --git a/src/univ/inpcons.cpp b/src/univ/inpcons.cpp
index 1f6a7d875556f9fa2edbb3b5ea32aa31d8d2771d..e0b85433f0b9c3bad8cb59451bfe155d964068db 100644 (file)
--- a/src/univ/inpcons.cpp
+++ b/src/univ/inpcons.cpp
@@ -13,10 +13,6 @@
 // declarations
 // ============================================================================
 
-#ifdef __GNUG__
-    #pragma implementation "inpcons.h"
-#endif
-
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
@@ -66,13 +62,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 +76,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 +96,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;
 }