fixed DrawText to use text colours instead of pen+brush colours

[wxWidgets.git] / src / mac / carbon / bmpbuttn.cpp

diff --git a/src/mac/carbon/bmpbuttn.cpp b/src/mac/carbon/bmpbuttn.cpp
index ebf802126278a3c96a90ea1d89260ee7e347e0e6..f6badadfeb5a52c9df4c259f3628de0ff1085c1f 100644 (file)
--- a/src/mac/carbon/bmpbuttn.cpp
+++ b/src/mac/carbon/bmpbuttn.cpp
@@ -1,92 +1,143 @@
 /////////////////////////////////////////////////////////////////////////////
-// 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
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#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/window.h"
+    #include "wx/bitmap.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;
+
+    // since bitmapbuttonbase is subclass of button calling wxBitmapButtonBase::Create
+    // essentially creates an additional button
+    if ( !wxControl::Create( parent, id, pos, size, style, validator, name ) )
+        return false;
+
     m_bmpNormal = bitmap;
- 
-    m_marginX = 0;
-    m_marginY = 0;
 
-    // int x = pos.x;
-    // int y = pos.y;
+    if ( style & wxBU_AUTODRAW )
+    {
+        m_marginX =
+        m_marginY = wxDEFAULT_BUTTON_MARGIN;
+    }
+    else
+    {
+        m_marginX =
+        m_marginY = 0;
+    }
+
     int width = size.x;
     int height = size.y;
 
-    if (id == -1)
-        m_windowId = NewControlId();
+    if ( bitmap.Ok() )
+    {
+        wxSize newSize = DoGetBestSize();
+        if ( width == wxDefaultCoord )
+            width = newSize.x;
+        if ( height == wxDefaultCoord )
+            height = newSize.y;
+    }
+
+    m_bmpNormal = bitmap;
+
+    OSStatus err = noErr;
+    ControlButtonContentInfo info;
+
+    Rect bounds = wxMacGetBoundsForControl( this, pos, size );
+    m_peer = new wxMacControl( this );
+
+#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
-        m_windowId = id;
+#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() );
+    }
 
-    if ( width == -1 && bitmap.Ok())
-    width = bitmap.GetWidth() + 2*m_marginX;
+    verify_noerr( err );
 
-    if ( height == -1 && bitmap.Ok())
-    height = bitmap.GetHeight() + 2*m_marginY;
+    wxMacReleaseBitmapButton( &info );
+    wxASSERT_MSG( m_peer != NULL && m_peer->Ok(), wxT("No valid native Mac control") );
 
-    Rect bounds ;
-    Str255 title ;
+    MacPostControlCreate( pos, size );
+
+    return true;
+}
+
+void wxBitmapButton::SetBitmapLabel( const wxBitmap& bitmap )
+{
     m_bmpNormal = bitmap;
-    wxBitmapRefData * bmap = NULL ;
-    
-    if ( m_bmpNormal.Ok() )
-        bmap = (wxBitmapRefData*) ( m_bmpNormal.GetRefData()) ;
-    
-    MacPreControlCreate( parent , id ,  "" , pos , wxSize( width , height ) ,style, validator , name , &bounds , title ) ;
-
-    m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , 0 , 
-        kControlBehaviorOffsetContents + 
-            ( bmap && bmap->m_bitmapType == kMacBitmapTypeIcon ? 
-            kControlContentCIconHandle : kControlContentPictHandle ) , 0, 
-          (( style & wxBU_AUTODRAW ) ? kControlBevelButtonSmallBevelProc : kControlBevelButtonNormalBevelProc ), (long) this ) ;
-    wxASSERT_MSG( (ControlHandle) m_macControl != NULL , "No valid mac control" ) ;
-    
-    ControlButtonContentInfo info ;
-    wxMacCreateBitmapButton( &info , m_bmpNormal ) ;
-    if ( info.contentType != kControlNoContent )
+    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
     {
-        ::SetControlData( (ControlHandle) m_macControl , kControlButtonPart , kControlBevelButtonContentTag , sizeof(info) , (char*) &info ) ;
+        wxMacCreateBitmapButton( &info, m_bmpNormal );
+        if ( info.contentType != kControlNoContent )
+            m_peer->SetData( kControlButtonPart, kControlBevelButtonContentTag, info );
     }
-    MacPostControlCreate() ;
 
-    return TRUE;
+    wxMacReleaseBitmapButton( &info );
 }
 
-void wxBitmapButton::SetBitmapLabel(const wxBitmap& bitmap)
+wxSize wxBitmapButton::DoGetBestSize() const
 {
-    m_bmpNormal = bitmap;
+    wxSize best;
 
-    ControlButtonContentInfo info ;
-    wxMacCreateBitmapButton( &info , m_bmpNormal ) ;
-    if ( info.contentType != kControlNoContent )
+    best.x = 2 * m_marginX;
+    best.y = 2 * m_marginY;
+    if ( m_bmpNormal.Ok() )
     {
-        ::SetControlData( (ControlHandle) m_macControl , kControlButtonPart , kControlBevelButtonContentTag , sizeof(info) , (char*) &info ) ;
+        best.x += m_bmpNormal.GetWidth();
+        best.y += m_bmpNormal.GetHeight();
     }
+
+    return best;
 }
 
+#endif