AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cleanup - reformatting

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37608 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Surovell 2006-02-15 19:59:27 +00:00
parent 1089fc00cd
commit cc374a2f29
1 changed files with 53 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

97
src/mac/carbon/bmpbuttn.cpp
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: bmpbuttn.cpp
// Name: src/mac/carbon/bmpbuttn.cpp
// Purpose: wxBitmapButton
// Author: Stefan Csomor
// Modified by:
@ -21,30 +21,31 @@ 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;
}
@ -61,70 +62,78 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bit
}
m_bmpNormal = bitmap;
ControlButtonContentInfo info ;
Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
m_peer = new wxMacControl( this ) ;
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 ) ;
verify_noerr ( CreateIconControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , &info , false , m_peer->GetControlRefAddr() ) );
wxMacCreateBitmapButton( &info, m_bmpNormal, kControlContentIconRef );
err = CreateIconControl(
MAC_WXHWND(parent->MacGetTopLevelWindowRef()),
&bounds, &info, false, m_peer->GetControlRefAddr() );
}
else
#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() ) );
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() );
}
wxMacReleaseBitmapButton( &info ) ;
wxASSERT_MSG( m_peer != NULL && m_peer->Ok() , wxT("No valid mac control") ) ;
MacPostControlCreate(pos,size) ;
return TRUE;
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 ;
ControlButtonContentInfo info;
#ifdef __WXMAC_OSX__
if ( HasFlag( wxBORDER_NONE ) )
{
wxMacCreateBitmapButton( &info , m_bmpNormal , kControlContentIconRef ) ;
wxMacCreateBitmapButton( &info, m_bmpNormal, kControlContentIconRef );
if ( info.contentType != kControlNoContent )
{
m_peer->SetData( kControlIconPart , kControlIconContentTag , info ) ;
}
m_peer->SetData( kControlIconPart, kControlIconContentTag, info );
}
else
#endif
{
wxMacCreateBitmapButton( &info , m_bmpNormal ) ;
wxMacCreateBitmapButton( &info, m_bmpNormal );
if ( info.contentType != kControlNoContent )
{
m_peer->SetData( kControlButtonPart , kControlBevelButtonContentTag , info ) ;
}
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;
}