/////////////////////////////////////////////////////////////////////////////
// Name: 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/window.h"
#include "wx/bmpbuttn.h"
-#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxButton)
-#endif
#include "wx/mac/uma.h"
#include "wx/bitmap.h"
const wxValidator& validator,
const wxString& name)
{
- m_buttonBitmap = bitmap;
+ 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;
+ if (style & wxBU_AUTODRAW)
+ {
+ m_marginX = wxDEFAULT_BUTTON_MARGIN;
+ m_marginY = wxDEFAULT_BUTTON_MARGIN;
+ }
+ else
+ {
+ m_marginX = 0;
+ 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 == -1 )
+ width = newSize.x;
+ if ( height == -1 )
+ height = newSize.y;
+ }
+
+ m_bmpNormal = bitmap;
+
+ 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 ) ;
+ verify_noerr ( 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;
-
- Rect bounds ;
- Str255 title ;
- m_buttonBitmap = bitmap;
- wxBitmapRefData * bmap = (wxBitmapRefData*) ( m_buttonBitmap.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->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 ;
-
-
- if ( m_buttonBitmap.Ok() )
- {
- if ( bmap->m_bitmapType == kMacBitmapTypePict ) {
- info.contentType = kControlContentPictHandle ;
- info.u.picture = MAC_WXHMETAFILE( bmap->m_hPict ) ;
- }
- else if ( bmap->m_bitmapType == kMacBitmapTypeGrafWorld )
- {
- if ( m_buttonBitmap.GetMask() )
- {
- info.contentType = kControlContentCIconHandle ;
- info.u.cIconHandle = wxMacCreateCIcon( MAC_WXHBITMAP( bmap->m_hBitmap ) , MAC_WXHBITMAP(m_buttonBitmap.GetMask()->GetMaskBitmap()) ,
- 8 , 16 ) ;
- }
- else
- {
- info.contentType = kControlContentCIconHandle ;
- info.u.cIconHandle = wxMacCreateCIcon( MAC_WXHBITMAP( bmap->m_hBitmap ) , NULL ,
- 8 , 16 ) ;
- }
- }
- else if ( bmap->m_bitmapType == kMacBitmapTypeIcon )
- {
- info.contentType = kControlContentCIconHandle ;
- info.u.cIconHandle = MAC_WXHICON(bmap->m_hIcon) ;
- }
- }
-
- ::SetControlData( (ControlHandle) m_macControl , kControlButtonPart , kControlBevelButtonContentTag , sizeof(info) , (char*) &info ) ;
-
- MacPostControlCreate() ;
+#endif
+ {
+ wxMacCreateBitmapButton( &info , m_bmpNormal ) ;
+ 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;
}
void wxBitmapButton::SetBitmapLabel(const wxBitmap& bitmap)
{
- ControlButtonContentInfo info ;
- m_buttonBitmap = bitmap;
-
- if ( m_buttonBitmap.Ok() )
- {
- wxBitmapRefData * bmap = (wxBitmapRefData*) ( m_buttonBitmap.GetRefData()) ;
- if ( bmap->m_bitmapType == kMacBitmapTypePict ) {
- info.contentType = kControlContentPictHandle ;
- info.u.picture = MAC_WXHMETAFILE(bmap->m_hPict) ;
- }
- else if ( bmap->m_bitmapType == kMacBitmapTypeGrafWorld )
- {
- if ( m_buttonBitmap.GetMask() )
- {
- info.contentType = kControlContentCIconHandle ;
- info.u.cIconHandle = wxMacCreateCIcon( MAC_WXHBITMAP(bmap->m_hBitmap) , MAC_WXHBITMAP(m_buttonBitmap.GetMask()->GetMaskBitmap()) ,
- 8 , 16 ) ;
- }
- else
- {
- info.contentType = kControlContentCIconHandle ;
- info.u.cIconHandle = wxMacCreateCIcon( MAC_WXHBITMAP(bmap->m_hBitmap) , NULL ,
- 8 , 16 ) ;
- }
- }
- else if ( bmap->m_bitmapType == kMacBitmapTypeIcon )
- {
- info.contentType = kControlContentCIconHandle ;
- info.u.cIconHandle = MAC_WXHICON( bmap->m_hIcon ) ;
- }
-
-
- ::SetControlData( (ControlHandle) 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;
+ if (m_bmpNormal.Ok())
+ {
+ best.x = m_bmpNormal.GetWidth() + 2*m_marginX;
+ best.y = m_bmpNormal.GetHeight() + 2*m_marginY;
+ }
+ return best;
+}
+
+#endif
projects / wxWidgets.git / blobdiff