X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/179e085f05fab385b89a18281e115003de890388..968c951fe1f6aba8276d6585c452b89bfa95993d:/src/mac/carbon/bmpbuttn.cpp diff --git a/src/mac/carbon/bmpbuttn.cpp b/src/mac/carbon/bmpbuttn.cpp index 84fb35b64f..aae979a862 100644 --- a/src/mac/carbon/bmpbuttn.cpp +++ b/src/mac/carbon/bmpbuttn.cpp @@ -1,113 +1,189 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: bmpbuttn.cpp +// Name: src/mac/carbon/bmpbuttn.cpp // Purpose: wxBitmapButton // Author: Stefan Csomor // Modified by: // Created: 1998-01-01 // RCS-ID: $Id$ // Copyright: (c) Stefan Csomor -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "bmpbuttn.h" -#endif - #include "wx/wxprec.h" #if wxUSE_BMPBUTTON -#include "wx/window.h" #include "wx/bmpbuttn.h" -#if !USE_SHARED_LIBRARY -IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxButton) +#ifndef WX_PRECOMP + #include "wx/dcmemory.h" #endif +IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxButton) + #include "wx/mac/uma.h" -#include "wx/bitmap.h" -bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap, - const wxPoint& pos, - const wxSize& size, long style, - const wxValidator& validator, - const wxString& name) +//--------------------------------------------------------------------------- +// Helper functions + +static wxBitmap wxMakeStdSizeBitmap(const wxBitmap& bitmap) { - m_macIsUserPane = FALSE ; + // in Mac OS X the icon controls (which are used for borderless bitmap + // buttons) can have only one of the few standard sizes and if they + // don't, the OS rescales them automatically resulting in really ugly + // images, so centre the image in a square of standard size instead + + // the supported sizes, sorted in decreasng order + static const int stdSizes[] = { 128, 48, 32, 16, 0 }; + + const int width = bitmap.GetWidth(); + const int height = bitmap.GetHeight(); + + wxBitmap newBmp(bitmap); + int n; + for ( n = 0; n < (int)WXSIZEOF(stdSizes); n++ ) + { + const int sizeStd = stdSizes[n]; + if ( width > sizeStd || height > sizeStd ) + { + // it will become -1 if the bitmap is larger than the biggest + // supported size, this is intentional + n--; + + break; + } + } + + if ( n != -1 ) + { + const int sizeStd = stdSizes[n]; + if ( width != sizeStd || height != sizeStd ) + { + wxASSERT_MSG( width <= sizeStd && height <= sizeStd, + _T("bitmap shouldn't be cropped") ); + + newBmp.Create(sizeStd, sizeStd); + wxMemoryDC dcMem; + dcMem.SelectObject(newBmp); + dcMem.Clear(); + + dcMem.DrawBitmap(bitmap, + (sizeStd - width)/2, (sizeStd-height)/2, + true); + } + } + //else: let the system rescale the bitmap + + return newBmp; +} + +//--------------------------------------------------------------------------- + +bool wxBitmapButton::Create( wxWindow *parent, + wxWindowID id, const wxBitmap& bitmap, + const wxPoint& pos, + const wxSize& size, + long style, + const wxValidator& validator, + const wxString& name ) +{ + m_macIsUserPane = false; + // since bitmapbuttonbase is subclass of button calling wxBitmapButtonBase::Create // essentially creates an additional button - if ( !wxControl::Create(parent, id, pos, size, - style, validator, name) ) + if ( !wxControl::Create( parent, id, pos, size, style, validator, name ) ) return false; - m_bmpNormal = bitmap; - - if (style & wxBU_AUTODRAW) + if ( style & wxBU_AUTODRAW ) { - m_marginX = wxDEFAULT_BUTTON_MARGIN; + m_marginX = m_marginY = wxDEFAULT_BUTTON_MARGIN; } else { - m_marginX = 0; + m_marginX = m_marginY = 0; } - int width = size.x; - int height = size.y; + OSStatus err = noErr; + ControlButtonContentInfo info; - if ( bitmap.Ok() ) + Rect bounds = wxMacGetBoundsForControl( this, pos, size ); + m_peer = new wxMacControl( this ); + + if ( bitmap.Ok() && HasFlag(wxBORDER_NONE) ) + m_bmpNormal = wxMakeStdSizeBitmap(bitmap); + else + m_bmpNormal = bitmap; + + + if ( HasFlag( wxBORDER_NONE ) ) + { + // contrary to the docs this control only works with iconrefs + wxMacCreateBitmapButton( &info, m_bmpNormal, kControlContentIconRef ); + err = CreateIconControl( + MAC_WXHWND(parent->MacGetTopLevelWindowRef()), + &bounds, &info, false, m_peer->GetControlRefAddr() ); + } + else { - wxSize newSize = DoGetBestSize(); - if ( width == -1 ) - width = newSize.x; - if ( height == -1 ) - height = newSize.y; + wxMacCreateBitmapButton( &info, m_bmpNormal ); + err = CreateBevelButtonControl( + MAC_WXHWND(parent->MacGetTopLevelWindowRef()), &bounds, CFSTR(""), + ((style & wxBU_AUTODRAW) ? kControlBevelButtonSmallBevel : kControlBevelButtonNormalBevel ), + kControlBehaviorOffsetContents, &info, 0, 0, 0, m_peer->GetControlRefAddr() ); } - m_bmpNormal = bitmap; - - ControlButtonContentInfo info ; - wxMacCreateBitmapButton( &info , m_bmpNormal ) ; + verify_noerr( err ); - Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ; - m_peer = new wxMacControl() ; - verify_noerr ( CreateBevelButtonControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , CFSTR("") , - (( style & wxBU_AUTODRAW ) ? kControlBevelButtonSmallBevel : kControlBevelButtonNormalBevel ) , - kControlBehaviorOffsetContents , &info , 0 , 0 , 0 , m_peer->GetControlRefAddr() ) ); - - wxMacReleaseBitmapButton( &info ) ; - wxASSERT_MSG( m_peer != NULL && m_peer->Ok() , wxT("No valid mac control") ) ; - - MacPostControlCreate(pos,size) ; + wxMacReleaseBitmapButton( &info ); + wxASSERT_MSG( m_peer != NULL && m_peer->Ok(), wxT("No valid native Mac control") ); + + MacPostControlCreate( pos, size ); - return TRUE; + return true; } -void wxBitmapButton::SetBitmapLabel(const wxBitmap& bitmap) +void wxBitmapButton::SetBitmapLabel( const wxBitmap& bitmap ) { - m_bmpNormal = bitmap; + if ( HasFlag( wxBORDER_NONE ) ) + m_bmpNormal = wxMakeStdSizeBitmap(bitmap); + else + m_bmpNormal = bitmap; + InvalidateBestSize(); - ControlButtonContentInfo info ; - wxMacCreateBitmapButton( &info , m_bmpNormal ) ; - if ( info.contentType != kControlNoContent ) + ControlButtonContentInfo info; + + if ( HasFlag( wxBORDER_NONE ) ) + { + wxMacCreateBitmapButton( &info, m_bmpNormal, kControlContentIconRef ); + if ( info.contentType != kControlNoContent ) + m_peer->SetData( kControlIconPart, kControlIconContentTag, info ); + } + else { - m_peer->SetData( kControlButtonPart , kControlBevelButtonContentTag , info ) ; + wxMacCreateBitmapButton( &info, m_bmpNormal ); + if ( info.contentType != kControlNoContent ) + m_peer->SetData( kControlButtonPart, kControlBevelButtonContentTag, info ); } - wxMacReleaseBitmapButton( &info ) ; -} + wxMacReleaseBitmapButton( &info ); +} wxSize wxBitmapButton::DoGetBestSize() const { wxSize best; - if (m_bmpNormal.Ok()) + + best.x = 2 * m_marginX; + best.y = 2 * m_marginY; + if ( m_bmpNormal.Ok() ) { - best.x = m_bmpNormal.GetWidth() + 2*m_marginX; - best.y = m_bmpNormal.GetHeight() + 2*m_marginY; + best.x += m_bmpNormal.GetWidth(); + best.y += m_bmpNormal.GetHeight(); } + return best; }