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

don't remove the tools we hadn't added to the toolbar (replaces patch 1660201)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45313 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-04-07 21:59:56 +00:00
parent 105fbe1ffa
commit 58862dfa1a
1 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1103,6 +1103,8 @@ bool wxToolBar::Realize()
#if wxMAC_USE_NATIVE_TOOLBAR #if wxMAC_USE_NATIVE_TOOLBAR
CFIndex currentPosition = 0; CFIndex currentPosition = 0;
bool insertAll = false; bool insertAll = false;
HIToolbarRef refTB = (HIToolbarRef)m_macHIToolbarRef;
#endif #endif
node = m_tools.GetFirst(); node = m_tools.GetFirst();
@@ -1142,9 +1144,9 @@ bool wxToolBar::Realize()
#if wxMAC_USE_NATIVE_TOOLBAR #if wxMAC_USE_NATIVE_TOOLBAR
// install in native HIToolbar // install in native HIToolbar
if ( m_macHIToolbarRef != NULL ) if ( refTB )
{ {
HIToolbarItemRef hiItemRef = tool->GetToolbarItemRef(); HIToolbarItemRef hiItemRef = tool->GetToolbarItemRef();
if ( hiItemRef != NULL ) if ( hiItemRef != NULL )
{ {
if ( insertAll || (tool->GetIndex() != currentPosition) ) if ( insertAll || (tool->GetIndex() != currentPosition) )
@@ -1156,25 +1158,32 @@ bool wxToolBar::Realize()
// if this is the first tool that gets newly inserted or repositioned // 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 // 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 // all following tools will have to be reinserted (insertAll).
// no way to determine how many there are in a toolbar, so just a high number :-( for ( wxToolBarToolsList::compatibility_iterator node2 = m_tools.GetLast();
for ( CFIndex i = 100; i >= currentPosition; --i ) node2 != node;
node2 = node2->GetPrevious() )
{ {
err = HIToolbarRemoveItemAtIndex( (HIToolbarRef) m_macHIToolbarRef, i ); wxToolBarTool *tool2 = (wxToolBarTool*) node2->GetData();
}
if (err != noErr) const long idx = tool2->GetIndex();
{ if ( idx != -1 )
wxString errMsg = wxString::Format( wxT("HIToolbarRemoveItemAtIndex failed [%ld]"), (long)err ); {
wxFAIL_MSG( errMsg.c_str() ); err = HIToolbarRemoveItemAtIndex(refTB, idx);
if ( err != noErr )
{
wxLogDebug(wxT("HIToolbarRemoveItemAtIndex(%ld) failed [%ld]"),
idx, (long)err);
}
tool2->SetIndex(-1);
}
} }
} }
err = HIToolbarInsertItemAtIndex( (HIToolbarRef) m_macHIToolbarRef, hiItemRef, currentPosition ); err = HIToolbarInsertItemAtIndex( refTB, hiItemRef, currentPosition );
if (err != noErr) if (err != noErr)
{ {
wxString errMsg = wxString::Format( wxT("HIToolbarInsertItemAtIndex failed [%ld]"), (long)err ); wxLogDebug( wxT("HIToolbarInsertItemAtIndex failed [%ld]"), (long)err );
wxFAIL_MSG( errMsg.c_str() );
} }
tool->SetIndex( currentPosition ); tool->SetIndex( currentPosition );