Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

new bitmap code

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14253 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2002-02-16 13:36:29 +00:00
parent 36aac19594
commit be2958285a
6 changed files with 120 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/mac/bitmap.cpp
View File

@@ -289,6 +289,57 @@ PicHandle wxMacCreatePict(GWorldPtr wp, GWorldPtr mask)
return pict;
}
void wxMacCreateBitmapButton( ControlButtonContentInfo*info , const wxBitmap& bitmap )
{
memset( info , 0 , sizeof(ControlButtonContentInfo) ) ;
if ( bitmap.Ok() )
{
wxBitmapRefData * bmap = (wxBitmapRefData*) ( bitmap.GetRefData()) ;
if ( bmap == NULL )
return ;
if ( bmap->m_bitmapType == kMacBitmapTypePict )
{
info->contentType = kControlContentPictHandle ;
info->u.picture = MAC_WXHMETAFILE(bmap->m_hPict) ;
}
else if ( bmap->m_bitmapType == kMacBitmapTypeGrafWorld )
{
if ( (bmap->m_width == bmap->m_height) && (bmap->m_width & 0x3 == 0) )
{
info->contentType = kControlContentCIconHandle ;
if ( bitmap.GetMask() )
{
info->u.cIconHandle = wxMacCreateCIcon( MAC_WXHBITMAP(bmap->m_hBitmap) , MAC_WXHBITMAP(bitmap.GetMask()->GetMaskBitmap()) ,
8 , bmap->m_width ) ;
}
else
{
info->u.cIconHandle = wxMacCreateCIcon( MAC_WXHBITMAP(bmap->m_hBitmap) , NULL ,
8 , bmap->m_width ) ;
}
}
else
{
info->contentType = kControlContentPictHandle ;
if ( bitmap.GetMask() )
{
info->u.picture = wxMacCreatePict( MAC_WXHBITMAP(bmap->m_hBitmap) , MAC_WXHBITMAP(bitmap.GetMask()->GetMaskBitmap() ) ) ;
}
else
{
info->u.picture = wxMacCreatePict( MAC_WXHBITMAP(bmap->m_hBitmap) , NULL ) ;
}
}
}
else if ( bmap->m_bitmapType == kMacBitmapTypeIcon )
{
info->contentType = kControlContentCIconHandle ;
info->u.cIconHandle = MAC_WXHICON(bmap->m_hIcon) ;
}
}
}
wxBitmapRefData::wxBitmapRefData()
{
m_ok = FALSE;

65
src/mac/bmpbuttn.cpp
View File

@@ -64,38 +64,11 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bit
wxASSERT_MSG( (ControlHandle) m_macControl != NULL , "No valid mac control" ) ;
ControlButtonContentInfo info ;
if ( m_buttonBitmap.Ok() )
wxMacCreateBitmapButton( &info , m_buttonBitmap ) ;
if ( info.contentType != kControlNoContent )
{
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() ;
return TRUE;
@@ -103,38 +76,12 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bit
void wxBitmapButton::SetBitmapLabel(const wxBitmap& bitmap)
{
ControlButtonContentInfo info ;
m_buttonBitmap = bitmap;
if ( m_buttonBitmap.Ok() )
ControlButtonContentInfo info ;
wxMacCreateBitmapButton( &info , m_buttonBitmap ) ;
if ( info.contentType != kControlNoContent )
{
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 ) ;
}
}

51
src/mac/carbon/bitmap.cpp
View File

@@ -289,6 +289,57 @@ PicHandle wxMacCreatePict(GWorldPtr wp, GWorldPtr mask)
return pict;
}
void wxMacCreateBitmapButton( ControlButtonContentInfo*info , const wxBitmap& bitmap )
{
memset( info , 0 , sizeof(ControlButtonContentInfo) ) ;
if ( bitmap.Ok() )
{
wxBitmapRefData * bmap = (wxBitmapRefData*) ( bitmap.GetRefData()) ;
if ( bmap == NULL )
return ;
if ( bmap->m_bitmapType == kMacBitmapTypePict )
{
info->contentType = kControlContentPictHandle ;
info->u.picture = MAC_WXHMETAFILE(bmap->m_hPict) ;
}
else if ( bmap->m_bitmapType == kMacBitmapTypeGrafWorld )
{
if ( (bmap->m_width == bmap->m_height) && (bmap->m_width & 0x3 == 0) )
{
info->contentType = kControlContentCIconHandle ;
if ( bitmap.GetMask() )
{
info->u.cIconHandle = wxMacCreateCIcon( MAC_WXHBITMAP(bmap->m_hBitmap) , MAC_WXHBITMAP(bitmap.GetMask()->GetMaskBitmap()) ,
8 , bmap->m_width ) ;
}
else
{
info->u.cIconHandle = wxMacCreateCIcon( MAC_WXHBITMAP(bmap->m_hBitmap) , NULL ,
8 , bmap->m_width ) ;
}
}
else
{
info->contentType = kControlContentPictHandle ;
if ( bitmap.GetMask() )
{
info->u.picture = wxMacCreatePict( MAC_WXHBITMAP(bmap->m_hBitmap) , MAC_WXHBITMAP(bitmap.GetMask()->GetMaskBitmap() ) ) ;
}
else
{
info->u.picture = wxMacCreatePict( MAC_WXHBITMAP(bmap->m_hBitmap) , NULL ) ;
}
}
}
else if ( bmap->m_bitmapType == kMacBitmapTypeIcon )
{
info->contentType = kControlContentCIconHandle ;
info->u.cIconHandle = MAC_WXHICON(bmap->m_hIcon) ;
}
}
}
wxBitmapRefData::wxBitmapRefData()
{
m_ok = FALSE;

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

@@ -64,38 +64,11 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bit
wxASSERT_MSG( (ControlHandle) m_macControl != NULL , "No valid mac control" ) ;
ControlButtonContentInfo info ;
if ( m_buttonBitmap.Ok() )
wxMacCreateBitmapButton( &info , m_buttonBitmap ) ;
if ( info.contentType != kControlNoContent )
{
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() ;
return TRUE;
@@ -103,38 +76,12 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bit
void wxBitmapButton::SetBitmapLabel(const wxBitmap& bitmap)
{
ControlButtonContentInfo info ;
m_buttonBitmap = bitmap;
if ( m_buttonBitmap.Ok() )
ControlButtonContentInfo info ;
wxMacCreateBitmapButton( &info , m_buttonBitmap ) ;
if ( info.contentType != kControlNoContent )
{
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 ) ;
}
}

27
src/mac/carbon/toolbar.cpp
View File

@@ -210,37 +210,14 @@ bool wxToolBar::Realize()
toolrect.bottom = toolrect.top + toolSize.y ;
ControlButtonContentInfo info ;
if ( bmap )
{
if ( bmap->m_bitmapType == kMacBitmapTypePict )
{
info.contentType = kControlContentPictHandle ;
info.u.picture = MAC_WXHMETAFILE(bmap->m_hPict) ;
}
else if ( bmap->m_bitmapType == kMacBitmapTypeGrafWorld )
{
if ( tool->GetBitmap1().GetMask() )
{
info.contentType = kControlContentCIconHandle ;
info.u.cIconHandle = wxMacCreateCIcon( MAC_WXHBITMAP(bmap->m_hBitmap) , MAC_WXHBITMAP(tool->GetBitmap1().GetMask()->GetMaskBitmap()) ,
8 , 16 ) ;
}
else
{
info.contentType = kControlContentCIconHandle ;
info.u.cIconHandle = wxMacCreateCIcon( MAC_WXHBITMAP(bmap->m_hBitmap) , NULL ,
8 , 16 ) ;
}
}
}
wxMacCreateBitmapButton( &info , tool->GetBitmap1() ) ;
ControlHandle m_macToolHandle ;
SInt16 behaviour = kControlBehaviorOffsetContents ;
if ( tool->CanBeToggled() )
behaviour += kControlBehaviorToggles ;
if ( info.u.cIconHandle ) // since it is a handle we can use one of them
if ( info.contentType != kControlNoContent )
{
m_macToolHandle = ::NewControl( window , &toolrect , "\p" , false , 0 ,
behaviour + info.contentType , 0 , kControlBevelButtonNormalBevelProc , (long) this ) ;

27
src/mac/toolbar.cpp
View File

@@ -210,37 +210,14 @@ bool wxToolBar::Realize()
toolrect.bottom = toolrect.top + toolSize.y ;
ControlButtonContentInfo info ;
if ( bmap )
{
if ( bmap->m_bitmapType == kMacBitmapTypePict )
{
info.contentType = kControlContentPictHandle ;
info.u.picture = MAC_WXHMETAFILE(bmap->m_hPict) ;
}
else if ( bmap->m_bitmapType == kMacBitmapTypeGrafWorld )
{
if ( tool->GetBitmap1().GetMask() )
{
info.contentType = kControlContentCIconHandle ;
info.u.cIconHandle = wxMacCreateCIcon( MAC_WXHBITMAP(bmap->m_hBitmap) , MAC_WXHBITMAP(tool->GetBitmap1().GetMask()->GetMaskBitmap()) ,
8 , 16 ) ;
}
else
{
info.contentType = kControlContentCIconHandle ;
info.u.cIconHandle = wxMacCreateCIcon( MAC_WXHBITMAP(bmap->m_hBitmap) , NULL ,
8 , 16 ) ;
}
}
}
wxMacCreateBitmapButton( &info , tool->GetBitmap1() ) ;
ControlHandle m_macToolHandle ;
SInt16 behaviour = kControlBehaviorOffsetContents ;
if ( tool->CanBeToggled() )
behaviour += kControlBehaviorToggles ;
if ( info.u.cIconHandle ) // since it is a handle we can use one of them
if ( info.contentType != kControlNoContent )
{
m_macToolHandle = ::NewControl( window , &toolrect , "\p" , false , 0 ,
behaviour + info.contentType , 0 , kControlBevelButtonNormalBevelProc , (long) this ) ;