Put some life into GTK 2.0 drawing.

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

diff --git a/src/univ/button.cpp b/src/univ/button.cpp
index fe2cedc46d80a5b509801144f9569b190c45d7de..eaf7fea91bd05ef5d1f7256f7fe60f4419d41060 100644 (file)
--- a/src/univ/button.cpp
+++ b/src/univ/button.cpp
@@ -45,7 +45,7 @@
 // ----------------------------------------------------------------------------
 
 // default margins around the image
 // ----------------------------------------------------------------------------
 
 // default margins around the image

-static const wxCoord DEFAULT_BTN_MARGIN_X = 0;
+static const wxCoord DEFAULT_BTN_MARGIN_X = 0;  // We should give space for the border, at least.

 static const wxCoord DEFAULT_BTN_MARGIN_Y = 0;
 
 // ============================================================================
 static const wxCoord DEFAULT_BTN_MARGIN_Y = 0;
 
 // ============================================================================


@@ -286,7 +286,7 @@ bool wxStdButtonInputHandler::HandleMouse(wxInputConsumer *consumer,
     // the other mouse buttons are ignored
     if ( event.Button(1) )
     {
     // the other mouse buttons are ignored
     if ( event.Button(1) )
     {

-        if ( event.ButtonDown(1) )
+        if ( event.LeftDown() || event.LeftDClick() )

         {
             m_winCapture = consumer->GetInputWindow();
             m_winCapture->CaptureMouse();
         {
             m_winCapture = consumer->GetInputWindow();
             m_winCapture->CaptureMouse();


@@ -296,7 +296,7 @@ bool wxStdButtonInputHandler::HandleMouse(wxInputConsumer *consumer,
 
             return TRUE;
         }
 
             return TRUE;
         }

-        else // up
+        else if ( event.LeftUp() )

         {
             if ( m_winCapture )
             {
         {
             if ( m_winCapture )
             {


@@ -314,6 +314,7 @@ bool wxStdButtonInputHandler::HandleMouse(wxInputConsumer *consumer,
             //else: the mouse was released outside the window, this doesn't
             //      count as a click
         }
             //else: the mouse was released outside the window, this doesn't
             //      count as a click
         }

+        //else: don't do anything special about the double click

     }
 
     return wxStdInputHandler::HandleMouse(consumer, event);
     }
 
     return wxStdInputHandler::HandleMouse(consumer, event);