X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a3870b2ff595ba4bb4f0397ace77ceeb9628e94d..09ff2ee1632c8c484134da2a31d0d5c4d0a4bef4:/src/univ/button.cpp diff --git a/src/univ/button.cpp b/src/univ/button.cpp index 95d4ce4aee..b70394dc5c 100644 --- a/src/univ/button.cpp +++ b/src/univ/button.cpp @@ -17,7 +17,7 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "univbutton.h" #endif @@ -34,18 +34,21 @@ #include "wx/dcscreen.h" #include "wx/button.h" #include "wx/validate.h" + #include "wx/settings.h" #endif #include "wx/univ/renderer.h" #include "wx/univ/inphand.h" #include "wx/univ/theme.h" +#include "wx/univ/colschem.h" +#include "wx/stockitem.h" // ---------------------------------------------------------------------------- // constants // ---------------------------------------------------------------------------- // 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; // ============================================================================ @@ -61,27 +64,44 @@ IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl) void wxButton::Init() { m_isPressed = - m_isDefault = FALSE; + m_isDefault = false; } bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap, - const wxString &label, + const wxString &lbl, const wxPoint &pos, const wxSize &size, long style, const wxValidator& validator, const wxString &name) { - // center label by default - if ( !(style & wxALIGN_MASK) ) - { - style |= wxALIGN_CENTRE_HORIZONTAL | wxALIGN_CENTRE_VERTICAL; - } + wxString label(lbl); + if (label.empty() && wxIsStockID(id)) + label = wxGetStockLabel(id); + + long ctrl_style = style & !wxBU_ALIGN_MASK; + + wxASSERT_MSG( (ctrl_style & wxALIGN_MASK) == 0, + _T("Some style conflicts with align flags") ); + + if((style & wxBU_RIGHT) == wxBU_RIGHT) + ctrl_style |= wxALIGN_RIGHT; + else if((style & wxBU_LEFT) == wxBU_LEFT) + ctrl_style |= wxALIGN_LEFT; + else + ctrl_style |= wxALIGN_CENTRE_HORIZONTAL; + + if((style & wxBU_TOP) == wxBU_TOP) + ctrl_style |= wxALIGN_TOP; + else if((style & wxBU_BOTTOM) == wxBU_BOTTOM) + ctrl_style |= wxALIGN_BOTTOM; + else + ctrl_style |= wxALIGN_CENTRE_VERTICAL; - if ( !wxControl::Create(parent, id, pos, size, style, wxDefaultValidator, name) ) - return FALSE; + if ( !wxControl::Create(parent, id, pos, size, ctrl_style, validator, name) ) + return false; SetLabel(label); SetImageLabel(bitmap); @@ -89,7 +109,7 @@ bool wxButton::Create(wxWindow *parent, CreateInputHandler(wxINP_HANDLER_BUTTON); - return TRUE; + return true; } wxButton::~wxButton() @@ -111,8 +131,11 @@ wxSize wxButtonBase::GetDefaultSize() // this corresponds more or less to wxMSW standard in Win32 theme (see // wxWin32Renderer::AdjustSize()) - s_sizeBtn.x = 8*dc.GetCharWidth(); - s_sizeBtn.y = (11*dc.GetCharHeight())/10 + 2; +// s_sizeBtn.x = 8*dc.GetCharWidth(); +// s_sizeBtn.y = (11*dc.GetCharHeight())/10 + 2; + // Otto Wyss, Patch 664399 + s_sizeBtn.x = dc.GetCharWidth()*10 + 2; + s_sizeBtn.y = dc.GetCharHeight()*11/10 + 2; } return s_sizeBtn; @@ -134,12 +157,23 @@ wxSize wxButton::DoGetBestClientSize() const width += m_bitmap.GetWidth() + 2*m_marginBmpX; } - // for compatibility with other ports, the buttons default size is never - // less than the standard one - wxSize szDef = GetDefaultSize(); - if ( width < szDef.x ) - width = szDef.x; + // The default size should not be adjusted, so the code is moved into the + // renderer. This is conceptual wrong but currently the only solution. + // (Otto Wyss, Patch 664399) +/* + // for compatibility with other ports, the buttons default size is never + // less than the standard one, but not when display not PDAs. + if (wxSystemSettings::GetScreenType() > wxSYS_SCREEN_PDA) + { + if ( !(GetWindowStyle() & wxBU_EXACTFIT) ) + { + wxSize szDef = GetDefaultSize(); + if ( width < szDef.x ) + width = szDef.x; + } + } +*/ return wxSize(width, height); } @@ -149,10 +183,38 @@ wxSize wxButton::DoGetBestClientSize() const void wxButton::DoDraw(wxControlRenderer *renderer) { - renderer->DrawButtonBorder(); + if ( !(GetWindowStyle() & wxBORDER_NONE) ) + { + renderer->DrawButtonBorder(); + } + renderer->DrawLabel(m_bitmap, m_marginBmpX, m_marginBmpY); } +bool wxButton::DoDrawBackground(wxDC& dc) +{ + wxRect rect; + wxSize size = GetSize(); + rect.width = size.x; + rect.height = size.y; + + if ( GetBackgroundBitmap().Ok() ) + { + // get the bitmap and the flags + int alignment; + wxStretch stretch; + wxBitmap bmp = GetBackgroundBitmap(&alignment, &stretch); + wxControlRenderer::DrawBitmap(dc, bmp, rect, alignment, stretch); + } + else + { + m_renderer->DrawButtonSurface(dc, wxTHEME_BG_COLOUR(this), + rect, GetStateFlags()); + } + + return true; +} + // ---------------------------------------------------------------------------- // input processing // ---------------------------------------------------------------------------- @@ -161,7 +223,7 @@ void wxButton::Press() { if ( !m_isPressed ) { - m_isPressed = TRUE; + m_isPressed = true; Refresh(); } @@ -171,7 +233,7 @@ void wxButton::Release() { if ( m_isPressed ) { - m_isPressed = FALSE; + m_isPressed = false; Refresh(); } @@ -213,7 +275,7 @@ bool wxButton::PerformAction(const wxControlAction& action, else return wxControl::PerformAction(action, numArg, strArg); - return TRUE; + return true; } // ---------------------------------------------------------------------------- @@ -229,15 +291,15 @@ 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); } void wxButton::SetDefault() { - m_isDefault = TRUE; + m_isDefault = true; } // ============================================================================ @@ -248,25 +310,25 @@ wxStdButtonInputHandler::wxStdButtonInputHandler(wxInputHandler *handler) : wxStdInputHandler(handler) { m_winCapture = NULL; - m_winHasMouse = FALSE; + 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 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 @@ -279,17 +341,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; + m_winHasMouse = true; - control->PerformAction(wxACTION_BUTTON_PRESS); + consumer->PerformAction(wxACTION_BUTTON_PRESS); - return TRUE; + return true; } - else // up + else if ( event.LeftUp() ) { if ( m_winCapture ) { @@ -300,19 +362,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; + 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 @@ -323,47 +386,47 @@ bool wxStdButtonInputHandler::HandleMouseMove(wxControl *control, if ( event.Leaving() ) { // remember that the mouse is now outside - m_winHasMouse = FALSE; + 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; + return true; } // and entering it back should make it pressed again if it had been // pressed else if ( event.Entering() ) { // the mouse is (back) inside the button - m_winHasMouse = TRUE; + m_winHasMouse = true; // 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 true; } } - return wxStdInputHandler::HandleMouseMove(control, event); + return wxStdInputHandler::HandleMouseMove(consumer, event); } -bool wxStdButtonInputHandler::HandleFocus(wxControl *control, - const wxFocusEvent& event) +bool wxStdButtonInputHandler::HandleFocus(wxInputConsumer * WXUNUSED(consumer), + const wxFocusEvent& WXUNUSED(event)) { - // buttons change appearance when they get/lose focus, so return TRUE to + // buttons change appearance when they get/lose focus, so return true to // refresh - return TRUE; + return true; } -bool wxStdButtonInputHandler::HandleActivation(wxControl *control, - bool activated) +bool wxStdButtonInputHandler::HandleActivation(wxInputConsumer *consumer, + bool WXUNUSED(activated)) { // the default button changes appearance when the app is [de]activated, so - // return TRUE to refresh - return wxStaticCast(control, wxButton)->IsDefault(); + // return true to refresh + return wxStaticCast(consumer->GetInputWindow(), wxButton)->IsDefault(); } #endif // wxUSE_BUTTON