#include "wx/mac/uma.h"
+//---------------------------------------------------------------------------
+// Helper functions
+
+static wxBitmap wxMakeStdSizeBitmap(const wxBitmap& bitmap)
+{
+ // 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,
m_peer = new wxMacControl( this );
if ( bitmap.Ok() && HasFlag(wxBORDER_NONE) )
- {
- // 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();
-
- 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") );
-
- m_bmpNormal.Create(sizeStd, sizeStd);
- wxMemoryDC dcMem;
- dcMem.SelectObject(m_bmpNormal);
- dcMem.Clear();
-
- dcMem.DrawBitmap(bitmap,
- (sizeStd - width)/2, (sizeStd-height)/2,
- true);
- }
- }
- //else: let the system rescale the bitmap
- }
-
- if ( !m_bmpNormal.Ok() )
+ m_bmpNormal = wxMakeStdSizeBitmap(bitmap);
+ else
m_bmpNormal = bitmap;
-#ifdef __WXMAC_OSX__
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
-#endif
{
wxMacCreateBitmapButton( &info, m_bmpNormal );
err = CreateBevelButtonControl(
void wxBitmapButton::SetBitmapLabel( const wxBitmap& bitmap )
{
- m_bmpNormal = bitmap;
+ if ( HasFlag( wxBORDER_NONE ) )
+ m_bmpNormal = wxMakeStdSizeBitmap(bitmap);
+ else
+ m_bmpNormal = bitmap;
+
InvalidateBestSize();
ControlButtonContentInfo info;
-#ifdef __WXMAC_OSX__
if ( HasFlag( wxBORDER_NONE ) )
- {
+ {
wxMacCreateBitmapButton( &info, m_bmpNormal, kControlContentIconRef );
if ( info.contentType != kControlNoContent )
m_peer->SetData( kControlIconPart, kControlIconContentTag, info );
}
else
-#endif
{
wxMacCreateBitmapButton( &info, m_bmpNormal );
if ( info.contentType != kControlNoContent )