X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/23645bfa01b6450257f140a30c87565225b1ef4a..b4de6e0d251563883c64bcfa54ab730d3a1f3441:/src/univ/button.cpp diff --git a/src/univ/button.cpp b/src/univ/button.cpp index fe2cedc46d..7bda74e449 100644 --- a/src/univ/button.cpp +++ b/src/univ/button.cpp @@ -17,10 +17,6 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ - #pragma implementation "univbutton.h" -#endif - #include "wx/wxprec.h" #ifdef __BORLANDC__ @@ -34,18 +30,49 @@ #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" + +// ---------------------------------------------------------------------------- +// wxStdButtonInputHandler: translates SPACE and ENTER keys and the left mouse +// click into button press/release actions +// ---------------------------------------------------------------------------- + +class WXDLLEXPORT wxStdButtonInputHandler : public wxStdInputHandler +{ +public: + wxStdButtonInputHandler(wxInputHandler *inphand); + + virtual bool HandleKey(wxInputConsumer *consumer, + const wxKeyEvent& event, + bool pressed); + virtual bool HandleMouse(wxInputConsumer *consumer, + const wxMouseEvent& event); + virtual bool HandleMouseMove(wxInputConsumer *consumer, + const wxMouseEvent& event); + virtual bool HandleFocus(wxInputConsumer *consumer, + const wxFocusEvent& event); + virtual bool HandleActivation(wxInputConsumer *consumer, bool activated); + +private: + // the window (button) which has capture or NULL and the flag telling if + // the mouse is inside the button which captured it or not + wxWindow *m_winCapture; + bool m_winHasMouse; +}; // ---------------------------------------------------------------------------- // 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,35 +88,53 @@ 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); - if ( !wxControl::Create(parent, id, pos, size, style, wxDefaultValidator, name) ) - return FALSE; + long ctrl_style = style & ~wxBU_ALIGN_MASK; + ctrl_style = ctrl_style & ~wxALIGN_MASK; + + 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, ctrl_style, validator, name) ) + return false; SetLabel(label); - SetImageLabel(bitmap); - // SetBestSize(size); -- called by SetImageLabel() + + if (bitmap.Ok()) + SetImageLabel(bitmap); // SetInitialSize called by SetImageLabel() + else + SetInitialSize(size); CreateInputHandler(wxINP_HANDLER_BUTTON); - return TRUE; + return true; } wxButton::~wxButton() @@ -111,8 +156,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,15 +182,23 @@ wxSize wxButton::DoGetBestClientSize() const width += m_bitmap.GetWidth() + 2*m_marginBmpX; } + // 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 - if ( !(GetWindowStyle() & wxBU_EXACTFIT) ) + // less than the standard one, but not when display not PDAs. + if (wxSystemSettings::GetScreenType() > wxSYS_SCREEN_PDA) { - wxSize szDef = GetDefaultSize(); - if ( width < szDef.x ) - width = szDef.x; + if ( !(GetWindowStyle() & wxBU_EXACTFIT) ) + { + wxSize szDef = GetDefaultSize(); + if ( width < szDef.x ) + width = szDef.x; + } } - +*/ return wxSize(width, height); } @@ -160,6 +216,30 @@ void wxButton::DoDraw(wxControlRenderer *renderer) 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 // ---------------------------------------------------------------------------- @@ -168,7 +248,7 @@ void wxButton::Press() { if ( !m_isPressed ) { - m_isPressed = TRUE; + m_isPressed = true; Refresh(); } @@ -178,7 +258,7 @@ void wxButton::Release() { if ( m_isPressed ) { - m_isPressed = FALSE; + m_isPressed = false; Refresh(); } @@ -220,7 +300,15 @@ bool wxButton::PerformAction(const wxControlAction& action, else return wxControl::PerformAction(action, numArg, strArg); - return TRUE; + return true; +} + +/* static */ +wxInputHandler *wxButton::GetStdInputHandler(wxInputHandler *handlerDef) +{ + static wxStdButtonInputHandler s_handlerBtn(handlerDef); + + return &s_handlerBtn; } // ---------------------------------------------------------------------------- @@ -236,15 +324,17 @@ 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); + SetInitialSize(wxDefaultSize); } -void wxButton::SetDefault() +wxWindow *wxButton::SetDefault() { - m_isDefault = TRUE; + m_isDefault = true; + + return wxButtonBase::SetDefault(); } // ============================================================================ @@ -255,7 +345,7 @@ wxStdButtonInputHandler::wxStdButtonInputHandler(wxInputHandler *handler) : wxStdInputHandler(handler) { m_winCapture = NULL; - m_winHasMouse = FALSE; + m_winHasMouse = false; } bool wxStdButtonInputHandler::HandleKey(wxInputConsumer *consumer, @@ -267,7 +357,7 @@ bool wxStdButtonInputHandler::HandleKey(wxInputConsumer *consumer, { consumer->PerformAction(wxACTION_BUTTON_TOGGLE); - return TRUE; + return true; } return wxStdInputHandler::HandleKey(consumer, event, pressed); @@ -286,17 +376,17 @@ bool wxStdButtonInputHandler::HandleMouse(wxInputConsumer *consumer, // 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_winHasMouse = TRUE; + m_winHasMouse = true; consumer->PerformAction(wxACTION_BUTTON_PRESS); - return TRUE; + return true; } - else // up + else if ( event.LeftUp() ) { if ( m_winCapture ) { @@ -309,11 +399,12 @@ bool wxStdButtonInputHandler::HandleMouse(wxInputConsumer *consumer, // this will generate a click event 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(consumer, event); @@ -330,46 +421,46 @@ bool wxStdButtonInputHandler::HandleMouseMove(wxInputConsumer *consumer, 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 - consumer->GetInputWindow()->SetCurrent(FALSE); + 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 - consumer->GetInputWindow()->SetCurrent(TRUE); + consumer->GetInputWindow()->SetCurrent(true); consumer->PerformAction(wxACTION_BUTTON_PRESS); - return TRUE; + return true; } } return wxStdInputHandler::HandleMouseMove(consumer, event); } -bool wxStdButtonInputHandler::HandleFocus(wxInputConsumer *consumer, - 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(wxInputConsumer *consumer, - bool activated) + bool WXUNUSED(activated)) { // the default button changes appearance when the app is [de]activated, so - // return TRUE to refresh + // return true to refresh return wxStaticCast(consumer->GetInputWindow(), wxButton)->IsDefault(); }