/////////////////////////////////////////////////////////////////////////////
// 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__
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();
- 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 ) ;
+ if ( bitmap.Ok() )
+ {
+ wxSize newSize = DoGetBestSize();
+ if ( width == -1 )
+ width = newSize.x;
+ if ( height == -1 )
+ height = newSize.y;
+ }
- 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 ;
- wxMacCreateBitmapButton( &info , m_buttonBitmap ) ;
- if ( info.contentType != kControlNoContent )
- {
- ::SetControlData( (ControlHandle) m_macControl , kControlButtonPart , kControlBevelButtonContentTag , sizeof(info) , (char*) &info ) ;
+ m_bmpNormal = bitmap;
+
+ wxBitmapRefData * bmap = NULL ;
+
+ if ( m_bmpNormal.Ok() )
+ bmap = (wxBitmapRefData*) ( m_bmpNormal.GetRefData()) ;
+
+ Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
+ m_macControl = (WXWidget) ::NewControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , "\p" , true , 0 ,
+ kControlBehaviorOffsetContents +
+ ( bmap && bmap->m_bitmapType == kMacBitmapTypeIcon ?
+ kControlContentCIconHandle : kControlContentPictHandle ) , 0,
+ (( style & wxBU_AUTODRAW ) ? kControlBevelButtonSmallBevelProc : kControlBevelButtonNormalBevelProc ), (long) this ) ;
+ wxASSERT_MSG( (ControlRef) m_macControl != NULL , wxT("No valid mac control") ) ;
+
+ ControlButtonContentInfo info ;
+ wxMacCreateBitmapButton( &info , m_bmpNormal ) ;
+ if ( info.contentType != kControlNoContent )
+ {
+ ::SetControlData( (ControlRef) m_macControl , kControlButtonPart , kControlBevelButtonContentTag , sizeof(info) , (char*) &info ) ;
}
- MacPostControlCreate() ;
+ MacPostControlCreate(pos,size) ;
return TRUE;
}
void wxBitmapButton::SetBitmapLabel(const wxBitmap& bitmap)
{
- m_buttonBitmap = bitmap;
+ m_bmpNormal = bitmap;
- ControlButtonContentInfo info ;
- wxMacCreateBitmapButton( &info , m_buttonBitmap ) ;
- if ( info.contentType != kControlNoContent )
- {
- ::SetControlData( (ControlHandle) m_macControl , kControlButtonPart , kControlBevelButtonContentTag , sizeof(info) , (char*) &info ) ;
+ ControlButtonContentInfo info ;
+ wxMacCreateBitmapButton( &info , m_bmpNormal ) ;
+ if ( info.contentType != kControlNoContent )
+ {
+ ::SetControlData( (ControlRef) m_macControl , kControlButtonPart , kControlBevelButtonContentTag , sizeof(info) , (char*) &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;
+}