/////////////////////////////////////////////////////////////////////////////
-// Name: bmpbuttn.cpp
+// Name: src/mac/carbon/bmpbuttn.cpp
// Purpose: wxBitmapButton
-// Author: AUTHOR
+// Author: Stefan Csomor
// Modified by:
-// Created: ??/??/98
+// Created: 1998-01-01
// RCS-ID: $Id$
-// Copyright: (c) AUTHOR
-// Licence: wxWindows licence
+// Copyright: (c) Stefan Csomor
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
-#pragma implementation "bmpbuttn.h"
-#endif
+#include "wx/wxprec.h"
+
+#if wxUSE_BMPBUTTON
#include "wx/bmpbuttn.h"
-IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxButton)
+#ifndef WX_PRECOMP
+ #include "wx/window.h"
+ #include "wx/bitmap.h"
+#endif
-#include <wx/mac/uma.h>
+IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxButton)
-PicHandle MakePict(GWorldPtr wp) ;
+#include "wx/mac/uma.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_buttonBitmap = bitmap;
-
- m_marginX = 0;
- m_marginY = 0;
+ 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;
+
+ if ( style & wxBU_AUTODRAW )
+ {
+ m_marginX =
+ m_marginY = wxDEFAULT_BUTTON_MARGIN;
+ }
+ else
+ {
+ m_marginX =
+ m_marginY = 0;
+ }
- int x = pos.x;
- int y = pos.y;
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;
-
- if ( width == -1 && bitmap.Ok())
- width = bitmap.GetWidth() + 2*m_marginX;
-
- if ( height == -1 && bitmap.Ok())
- height = bitmap.GetHeight() + 2*m_marginY;
-
- m_macHorizontalBorder = 0 ; // additional pixels around the real control
- m_macVerticalBorder = 0 ;
- Rect bounds ;
- Str255 title ;
- MacPreControlCreate( parent , id , "" , pos , wxSize( width , height ) ,style, validator , name , &bounds , title ) ;
-
- m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , true , 0 ,
- kControlBehaviorOffsetContents + kControlContentPictHandle , 0,
- (( style & wxBU_AUTODRAW ) ? kControlBevelButtonSmallBevelProc : kControlBevelButtonNormalBevelProc ), (long) this ) ;
- wxASSERT_MSG( m_macControl != NULL , "No valid mac control" ) ;
-
- m_buttonBitmap = bitmap;
- PicHandle icon = NULL ;
- if ( m_buttonBitmap.Ok() )
- {
- wxBitmapRefData * bmap = (wxBitmapRefData*) ( m_buttonBitmap.GetRefData()) ;
- if ( bmap->m_bitmapType == kMacBitmapTypePict )
- icon = bmap->m_hPict ;
- else if ( bmap->m_bitmapType == kMacBitmapTypeGrafWorld )
- {
- icon = MakePict( bmap->m_hBitmap ) ;
- }
- }
- ControlButtonContentInfo info ;
-
- info.contentType = kControlContentPictHandle ;
- info.u.picture = icon ;
-
- UMASetControlData( m_macControl , kControlButtonPart , kControlBevelButtonContentTag , sizeof(info) , (char*) &info ) ;
-
- MacPostControlCreate() ;
-
- return TRUE;
+#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_buttonBitmap = bitmap;
- PicHandle icon = NULL ;
- if ( m_buttonBitmap.Ok() )
- {
- wxBitmapRefData * bmap = (wxBitmapRefData*) ( m_buttonBitmap.GetRefData()) ;
- if ( bmap->m_bitmapType == kMacBitmapTypePict )
- icon = bmap->m_hPict ;
- else if ( bmap->m_bitmapType == kMacBitmapTypeGrafWorld )
- {
- icon = MakePict( bmap->m_hBitmap ) ;
- }
- }
- ControlButtonContentInfo info ;
-
- info.contentType = kControlContentPictHandle ;
- info.u.picture = icon ;
-
- UMASetControlData( m_macControl , kControlButtonPart , kControlBevelButtonContentTag , sizeof(info) , (char*) &info ) ;
+ 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 )
+ m_peer->SetData( kControlButtonPart, kControlBevelButtonContentTag, info );
+ }
+
+ wxMacReleaseBitmapButton( &info );
}
+wxSize wxBitmapButton::DoGetBestSize() const
+{
+ wxSize best;
+
+ best.x = 2 * m_marginX;
+ best.y = 2 * m_marginY;
+ if ( m_bmpNormal.Ok() )
+ {
+ best.x += m_bmpNormal.GetWidth();
+ best.y += m_bmpNormal.GetHeight();
+ }
+
+ return best;
+}
+
+#endif