X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e4606ed9d0d0fb3c6b11e97185a66139ff703c35..0fa784572f2324fe246158d8eec9492fac604483:/src/univ/button.cpp?ds=sidebyside diff --git a/src/univ/button.cpp b/src/univ/button.cpp index 65a5b69c9b..f98b725e51 100644 --- a/src/univ/button.cpp +++ b/src/univ/button.cpp @@ -45,7 +45,7 @@ // ---------------------------------------------------------------------------- // 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; // ============================================================================ @@ -236,9 +236,9 @@ void wxButton::SetImageLabel(const wxBitmap& bitmap) void wxButton::SetImageMargins(wxCoord x, wxCoord y) { - m_marginBmpX = x; - m_marginBmpY = y; - + m_marginBmpX = x + 2; + m_marginBmpY = y + 2; + SetBestSize(wxDefaultSize); } @@ -258,22 +258,22 @@ wxStdButtonInputHandler::wxStdButtonInputHandler(wxInputHandler *handler) m_winHasMouse = FALSE; } -bool wxStdButtonInputHandler::HandleKey(wxControl *control, +bool wxStdButtonInputHandler::HandleKey(wxInputConsumer *consumer, const wxKeyEvent& event, bool pressed) { int keycode = event.GetKeyCode(); if ( keycode == WXK_SPACE || keycode == WXK_RETURN ) { - control->PerformAction(wxACTION_BUTTON_TOGGLE); + consumer->PerformAction(wxACTION_BUTTON_TOGGLE); return TRUE; } - return wxStdInputHandler::HandleKey(control, event, pressed); + return wxStdInputHandler::HandleKey(consumer, event, pressed); } -bool wxStdButtonInputHandler::HandleMouse(wxControl *control, +bool wxStdButtonInputHandler::HandleMouse(wxInputConsumer *consumer, const wxMouseEvent& event) { // the button has 2 states: pressed and normal with the following @@ -286,17 +286,17 @@ bool wxStdButtonInputHandler::HandleMouse(wxControl *control, // the other mouse buttons are ignored if ( event.Button(1) ) { - if ( event.ButtonDown(1) ) + if ( event.LeftDown() || event.LeftDClick() ) { - m_winCapture = control; + m_winCapture = consumer->GetInputWindow(); m_winCapture->CaptureMouse(); m_winHasMouse = TRUE; - control->PerformAction(wxACTION_BUTTON_PRESS); + consumer->PerformAction(wxACTION_BUTTON_PRESS); return TRUE; } - else // up + else if ( event.LeftUp() ) { if ( m_winCapture ) { @@ -307,19 +307,20 @@ bool wxStdButtonInputHandler::HandleMouse(wxControl *control, if ( m_winHasMouse ) { // this will generate a click event - control->PerformAction(wxACTION_BUTTON_TOGGLE); + consumer->PerformAction(wxACTION_BUTTON_TOGGLE); return TRUE; } //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(control, event); + return wxStdInputHandler::HandleMouse(consumer, event); } -bool wxStdButtonInputHandler::HandleMouseMove(wxControl *control, +bool wxStdButtonInputHandler::HandleMouseMove(wxInputConsumer *consumer, const wxMouseEvent& event) { // we only have to do something when the mouse leaves/enters the pressed @@ -333,8 +334,8 @@ bool wxStdButtonInputHandler::HandleMouseMove(wxControl *control, m_winHasMouse = FALSE; // we do have a pressed button, so release it - control->SetCurrent(FALSE); - control->PerformAction(wxACTION_BUTTON_RELEASE); + consumer->GetInputWindow()->SetCurrent(FALSE); + consumer->PerformAction(wxACTION_BUTTON_RELEASE); return TRUE; } @@ -347,17 +348,17 @@ bool wxStdButtonInputHandler::HandleMouseMove(wxControl *control, // we did have a pressed button which we released when leaving the // window, press it again - control->SetCurrent(TRUE); - control->PerformAction(wxACTION_BUTTON_PRESS); + consumer->GetInputWindow()->SetCurrent(TRUE); + consumer->PerformAction(wxACTION_BUTTON_PRESS); return TRUE; } } - return wxStdInputHandler::HandleMouseMove(control, event); + return wxStdInputHandler::HandleMouseMove(consumer, event); } -bool wxStdButtonInputHandler::HandleFocus(wxControl *control, +bool wxStdButtonInputHandler::HandleFocus(wxInputConsumer *consumer, const wxFocusEvent& event) { // buttons change appearance when they get/lose focus, so return TRUE to @@ -365,12 +366,12 @@ bool wxStdButtonInputHandler::HandleFocus(wxControl *control, return TRUE; } -bool wxStdButtonInputHandler::HandleActivation(wxControl *control, +bool wxStdButtonInputHandler::HandleActivation(wxInputConsumer *consumer, bool activated) { // the default button changes appearance when the app is [de]activated, so // return TRUE to refresh - return wxStaticCast(control, wxButton)->IsDefault(); + return wxStaticCast(consumer->GetInputWindow(), wxButton)->IsDefault(); } #endif // wxUSE_BUTTON