fixing notebook icons for panther
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25536 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
e411268c8c
commit
d5f7923b9e
@ -467,14 +467,18 @@ void wxNotebook::MacSetupTabs()
|
||||
OSErr err = SetIconFamilyData( iconFamily, 'PICT' , (Handle) info.u.picture ) ;
|
||||
wxASSERT_MSG( err == noErr , wxT("Error when adding bitmap") ) ;
|
||||
IconRef iconRef ;
|
||||
err = RegisterIconRefFromIconFamily( 'WXNG' , (OSType) 1 , iconFamily, &iconRef ) ;
|
||||
err = RegisterIconRefFromIconFamily( 'WXNG' , (OSType) 1, iconFamily, &iconRef ) ;
|
||||
wxASSERT_MSG( err == noErr , wxT("Error when adding bitmap") ) ;
|
||||
info.contentType = kControlContentIconRef ;
|
||||
info.u.iconRef = iconRef ;
|
||||
SetControlData( (ControlHandle) m_macControl, ii+1,kControlTabImageContentTag,
|
||||
sizeof( info ), (Ptr)&info );
|
||||
wxASSERT_MSG( err == noErr , wxT("Error when setting icon on tab") ) ;
|
||||
UnregisterIconRef( 'WXNG' , (OSType) 1 ) ;
|
||||
if ( UMAGetSystemVersion() <= 0x1030 )
|
||||
{
|
||||
UnregisterIconRef( 'WXNG' , (OSType) 1 ) ;
|
||||
}
|
||||
|
||||
ReleaseIconRef( iconRef ) ;
|
||||
DisposeHandle( (Handle) iconFamily ) ;
|
||||
}
|
||||
|
@ -467,14 +467,18 @@ void wxNotebook::MacSetupTabs()
|
||||
OSErr err = SetIconFamilyData( iconFamily, 'PICT' , (Handle) info.u.picture ) ;
|
||||
wxASSERT_MSG( err == noErr , wxT("Error when adding bitmap") ) ;
|
||||
IconRef iconRef ;
|
||||
err = RegisterIconRefFromIconFamily( 'WXNG' , (OSType) 1 , iconFamily, &iconRef ) ;
|
||||
err = RegisterIconRefFromIconFamily( 'WXNG' , (OSType) 1, iconFamily, &iconRef ) ;
|
||||
wxASSERT_MSG( err == noErr , wxT("Error when adding bitmap") ) ;
|
||||
info.contentType = kControlContentIconRef ;
|
||||
info.u.iconRef = iconRef ;
|
||||
SetControlData( (ControlHandle) m_macControl, ii+1,kControlTabImageContentTag,
|
||||
sizeof( info ), (Ptr)&info );
|
||||
wxASSERT_MSG( err == noErr , wxT("Error when setting icon on tab") ) ;
|
||||
UnregisterIconRef( 'WXNG' , (OSType) 1 ) ;
|
||||
if ( UMAGetSystemVersion() <= 0x1030 )
|
||||
{
|
||||
UnregisterIconRef( 'WXNG' , (OSType) 1 ) ;
|
||||
}
|
||||
|
||||
ReleaseIconRef( iconRef ) ;
|
||||
DisposeHandle( (Handle) iconFamily ) ;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user