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

optimizing for multiple Realize calls in sequence, moving EventHandler push to toolbar item creation

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35399 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2005-09-01 09:32:18 +00:00
parent 04732a7f27
commit 8138cfecaf
1 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -776,20 +776,6 @@ bool wxToolBar::Realize()
if (m_tools.GetCount() == 0) if (m_tools.GetCount() == 0)
return false; return false;
#if wxMAC_USE_NATIVE_TOOLBAR
// remove all tools, no way to determine how many there are in a toolbar, so just a high number :-(
OSStatus err = noErr ;
if ( m_macHIToolbarRef != NULL )
{
for ( CFIndex i = 0 ; i < 100 ; ++i )
{
err = HIToolbarRemoveItemAtIndex( (HIToolbarRef) m_macHIToolbarRef , i ) ;
}
}
wxASSERT_MSG( err == noErr, _T("HIToolbarRemoveItemAtIndex failed") );
#endif // wxMAC_USE_NATIVE_TOOLBAR
int x = m_xMargin + kwxMacToolBarLeftMargin; int x = m_xMargin + kwxMacToolBarLeftMargin;
int y = m_yMargin + kwxMacToolBarTopMargin; int y = m_yMargin + kwxMacToolBarTopMargin;
@@ -829,6 +815,7 @@ bool wxToolBar::Realize()
#if wxMAC_USE_NATIVE_TOOLBAR #if wxMAC_USE_NATIVE_TOOLBAR
CFIndex currentPosition = 0 ; CFIndex currentPosition = 0 ;
bool insertAll = false ;
#endif // wxMAC_USE_NATIVE_TOOLBAR #endif // wxMAC_USE_NATIVE_TOOLBAR
while ( node != NULL ) while ( node != NULL )
@@ -873,14 +860,27 @@ bool wxToolBar::Realize()
HIToolbarItemRef hiItemRef = tool->GetToolbarItemRef(); HIToolbarItemRef hiItemRef = tool->GetToolbarItemRef();
if ( hiItemRef != NULL ) if ( hiItemRef != NULL )
{ {
OSStatus result = HIToolbarInsertItemAtIndex( (HIToolbarRef) m_macHIToolbarRef, hiItemRef , currentPosition ) ; if ( tool->GetIndex() != currentPosition || insertAll == true )
if ( result == 0 )
{ {
OSStatus err = noErr ;
if ( !insertAll )
{
// if this is the first tool that gets newly inserted or repositioned
// first remove all 'old' tools from here to the right, because of this
// all following tools will have to be reinserted (insertAll). i = 100 because there's
// no way to determine how many there are in a toolbar, so just a high number :-(
for ( CFIndex i = 100 ; i >= currentPosition ; --i )
{
err = HIToolbarRemoveItemAtIndex( (HIToolbarRef) m_macHIToolbarRef , i ) ;
}
wxASSERT_MSG( err == noErr, _T("HIToolbarRemoveItemAtIndex failed") );
insertAll = true ;
}
err = HIToolbarInsertItemAtIndex( (HIToolbarRef) m_macHIToolbarRef, hiItemRef , currentPosition ) ;
wxASSERT_MSG( err == noErr, _T("HIToolbarInsertItemAtIndex failed") );
tool->SetIndex( currentPosition ) ; tool->SetIndex( currentPosition ) ;
currentPosition++ ;
InstallEventHandler( HIObjectGetEventTarget(hiItemRef), GetwxMacToolBarEventHandlerUPP(),
GetEventTypeCount(toolBarEventList), toolBarEventList, tool, NULL );
} }
currentPosition++ ;
} }
} }
#endif // wxMAC_USE_NATIVE_TOOLBAR #endif // wxMAC_USE_NATIVE_TOOLBAR
@@ -1133,6 +1133,8 @@ bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos),
kHIToolbarItemCantBeRemoved | kHIToolbarItemAnchoredLeft | kHIToolbarItemAllowDuplicates, &item ); kHIToolbarItemCantBeRemoved | kHIToolbarItemAnchoredLeft | kHIToolbarItemAllowDuplicates, &item );
if (err == noErr) if (err == noErr)
{ {
InstallEventHandler( HIObjectGetEventTarget(item), GetwxMacToolBarEventHandlerUPP(),
GetEventTypeCount(toolBarEventList), toolBarEventList, tool, NULL );
HIToolbarItemSetLabel( item, wxMacCFStringHolder(tool->GetLabel(), m_font.GetEncoding()) ); HIToolbarItemSetLabel( item, wxMacCFStringHolder(tool->GetLabel(), m_font.GetEncoding()) );
HIToolbarItemSetIconRef( item, info.u.iconRef ); HIToolbarItemSetIconRef( item, info.u.iconRef );
HIToolbarItemSetCommandID( item, kHIToolbarCommandPressAction ); HIToolbarItemSetCommandID( item, kHIToolbarCommandPressAction );