X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b905d6cc083a38d46ae48712f5221236247a39ce..b64c92ee20b022a88d3fe5371b0e17fb7818894f:/src/mac/carbon/bmpbuttn.cpp?ds=sidebyside

diff --git a/src/mac/carbon/bmpbuttn.cpp b/src/mac/carbon/bmpbuttn.cpp
index 727df6679c..26ee9dc953 100644
--- a/src/mac/carbon/bmpbuttn.cpp
+++ b/src/mac/carbon/bmpbuttn.cpp
@@ -1,113 +1,177 @@
 /////////////////////////////////////////////////////////////////////////////
-// 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)
+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 ;
-    
+    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;
+
+    Rect bounds = wxMacGetBoundsForControl( this, pos, size );
+    m_peer = new wxMacControl( this );
 
-    if ( bitmap.Ok() )
+    if ( bitmap.Ok() && HasFlag(wxBORDER_NONE) )
     {
-        wxSize newSize = DoGetBestSize();
-        if ( width == -1 )
-            width = newSize.x;
-        if ( height == -1 )
-            height = newSize.y;
+        // 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
     }
 
-    m_bmpNormal = bitmap;
-        
-    ControlButtonContentInfo info ;
-    wxMacCreateBitmapButton( &info , m_bmpNormal ) ;
-
-    Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
-    m_peer = new wxMacControl( this ) ;
-    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) ;
-
-    return TRUE;
+    if ( !m_bmpNormal.Ok() )
+        m_bmpNormal = bitmap;
+
+
+#ifdef __WXMAC_OSX__
+    if ( HasFlag( wxBORDER_NONE ) )
+    {
+        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(
+                MAC_WXHWND(parent->MacGetTopLevelWindowRef()), &bounds, CFSTR(""),
+                ((style & wxBU_AUTODRAW) ? kControlBevelButtonSmallBevel : kControlBevelButtonNormalBevel ),
+                kControlBehaviorOffsetContents, &info, 0, 0, 0, m_peer->GetControlRefAddr() );
+    }
+
+    verify_noerr( err );
+
+    wxMacReleaseBitmapButton( &info );
+    wxASSERT_MSG( m_peer != NULL && m_peer->Ok(), wxT("No valid native Mac control") );
+
+    MacPostControlCreate( pos, size );
+
+    return true;
 }
 
-void wxBitmapButton::SetBitmapLabel(const wxBitmap& bitmap)
+void wxBitmapButton::SetBitmapLabel( const wxBitmap& bitmap )
 {
     m_bmpNormal = bitmap;
     InvalidateBestSize();
 
-    ControlButtonContentInfo info ;
-    wxMacCreateBitmapButton( &info , m_bmpNormal ) ;
-    if ( info.contentType != kControlNoContent )
+    ControlButtonContentInfo info;
+
+#ifdef __WXMAC_OSX__
+    if ( HasFlag( wxBORDER_NONE ) )
     {
-        m_peer->SetData( kControlButtonPart , kControlBevelButtonContentTag , info ) ;
+        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 )
+            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;
 }