X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3b6a1179621302e72f6d563d87aa2eabf1d8ce5d..ded83b1a5cebd3c1257f4d254c97d3cfb39bb5aa:/src/mac/carbon/toolbar.cpp diff --git a/src/mac/carbon/toolbar.cpp b/src/mac/carbon/toolbar.cpp index 2e86683c88..f338f0fc77 100644 --- a/src/mac/carbon/toolbar.cpp +++ b/src/mac/carbon/toolbar.cpp @@ -13,10 +13,12 @@ #if wxUSE_TOOLBAR -#include "wx/wx.h" -#include "wx/bitmap.h" #include "wx/toolbar.h" +#ifndef WX_PRECOMP + #include "wx/wx.h" +#endif + #include "wx/mac/uma.h" #include "wx/geometry.h" @@ -58,15 +60,16 @@ END_EVENT_TABLE() class wxToolBarTool : public wxToolBarToolBase { public: - wxToolBarTool( wxToolBar *tbar, - int id, - const wxString& label, - const wxBitmap& bmpNormal, - const wxBitmap& bmpDisabled, - wxItemKind kind, - wxObject *clientData, - const wxString& shortHelp, - const wxString& longHelp ); + wxToolBarTool( + wxToolBar *tbar, + int id, + const wxString& label, + const wxBitmap& bmpNormal, + const wxBitmap& bmpDisabled, + wxItemKind kind, + wxObject *clientData, + const wxString& shortHelp, + const wxString& longHelp ); wxToolBarTool(wxToolBar *tbar, wxControl *control) : wxToolBarToolBase(tbar, control) @@ -76,11 +79,9 @@ public: SetControlHandle( (ControlRef) control->GetHandle() ); } - ~wxToolBarTool() + virtual ~wxToolBarTool() { ClearControl(); - if ( m_controlHandle ) - DisposeControl( m_controlHandle ); #if wxMAC_USE_NATIVE_TOOLBAR if ( m_toolbarItemRef ) @@ -103,6 +104,16 @@ public: void ClearControl() { m_control = NULL; + if ( m_controlHandle ) + { + if ( !IsControl() ) + DisposeControl( m_controlHandle ); + else + { + // the embedded control is not under the responsibility of the tool + } + m_controlHandle = NULL ; + } #if wxMAC_USE_NATIVE_TOOLBAR m_toolbarItemRef = NULL; @@ -111,25 +122,27 @@ public: wxSize GetSize() const { + wxSize curSize; + if ( IsControl() ) { - return GetControl()->GetSize(); + curSize = GetControl()->GetSize(); } else if ( IsButton() ) { - return GetToolBar()->GetToolSize(); + curSize = GetToolBar()->GetToolSize(); } else { // separator size - wxSize sz = GetToolBar()->GetToolSize(); + curSize = GetToolBar()->GetToolSize(); if ( GetToolBar()->GetWindowStyleFlag() & wxTB_VERTICAL ) - sz.y /= 4; + curSize.y /= 4; else - sz.x /= 4; - - return sz; + curSize.x /= 4; } + + return curSize; } wxPoint GetPosition() const @@ -226,7 +239,7 @@ static pascal OSStatus wxMacToolBarToolControlEventHandler( EventHandlerCallRef #ifdef __WXMAC_OSX__ shouldToggle = !tbartool->IsToggled(); #else - shouldToggle = ( GetControl32BitValue((ControlRef) tbartool->GetControlHandle()) != 0 ); + shouldToggle = (GetControl32BitValue( (ControlRef)(tbartool->GetControlHandle()) ) != 0); #endif tbar->ToggleTool( tbartool->GetId(), shouldToggle ); @@ -282,10 +295,6 @@ DEFINE_ONE_SHOT_HANDLER_GETTER( wxMacToolBarToolEventHandler ) #if wxMAC_USE_NATIVE_TOOLBAR -// -// native toolbar -// - static const EventTypeSpec toolBarEventList[] = { { kEventClassToolbarItem, kEventToolbarItemPerformAction }, @@ -307,11 +316,11 @@ static pascal OSStatus wxMacToolBarCommandEventHandler( EventHandlerCallRef hand if ( tbartool->CanBeToggled() ) { - if ( tbar ) + if ( tbar != NULL ) tbar->ToggleTool(toolID, !tbartool->IsToggled() ); } - if ( tbar ) + if ( tbar != NULL ) tbar->OnLeftClick( toolID, tbartool->IsToggled() ); result = noErr; } @@ -346,14 +355,6 @@ DEFINE_ONE_SHOT_HANDLER_GETTER( wxMacToolBarEventHandler ) #endif -// ============================================================================ -// implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// wxToolBarTool -// ---------------------------------------------------------------------------- - bool wxToolBarTool::DoEnable( bool enable ) { if ( IsControl() ) @@ -363,11 +364,11 @@ bool wxToolBarTool::DoEnable( bool enable ) else if ( IsButton() ) { #if wxMAC_USE_NATIVE_TOOLBAR - if ( m_toolbarItemRef ) + if ( m_toolbarItemRef != NULL ) HIToolbarItemSetEnabled( m_toolbarItemRef, enable ); #endif - if ( m_controlHandle ) + if ( m_controlHandle != NULL ) { #if TARGET_API_MAC_OSX if ( enable ) @@ -396,13 +397,6 @@ void wxToolBarTool::SetPosition( const wxPoint& position ) int mac_x = position.x; int mac_y = position.y; - if ( ! GetToolBar()->MacGetTopLevelWindow()->MacUsesCompositing() ) - { - GetToolBar()->MacWindowToRootWindow( &x, &y ); - mac_x += x; - mac_y += y; - } - if ( IsButton() ) { Rect contrlRect; @@ -418,7 +412,13 @@ void wxToolBarTool::SetPosition( const wxPoint& position ) } else if ( IsControl() ) { - GetControl()->Move( position ); + // embedded native controls are moved by the OS +#if wxMAC_USE_NATIVE_TOOLBAR + if ( ((wxToolBar*)GetToolBar())->MacWantsNativeToolbar() == false ) +#endif + { + GetControl()->Move( position ); + } } else { @@ -440,7 +440,7 @@ void wxToolBarTool::UpdateToggleImage( bool toggle ) #if wxMAC_USE_NATIVE_TOOLBAR #if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_4 -#define kHIToolbarItemSelected (1 << 7) +#define kHIToolbarItemSelected (1 << 7) #endif // FIXME: this should be a OSX v10.4 runtime check @@ -487,14 +487,14 @@ void wxToolBarTool::UpdateToggleImage( bool toggle ) { ControlButtonContentInfo info; wxMacCreateBitmapButton( &info, m_bmpNormal ); - SetControlData( m_controlHandle, 0, kControlIconContentTag, sizeof( info ), (Ptr)&info ); + SetControlData( m_controlHandle, 0, kControlIconContentTag, sizeof(info), (Ptr)&info ); wxMacReleaseBitmapButton( &info ); } IconTransformType transform = toggle ? kTransformSelected : kTransformNone; SetControlData( m_controlHandle, 0, kControlIconTransformTag, - sizeof( transform ), (Ptr)&transform ); + sizeof(transform), (Ptr)&transform ); HIViewSetNeedsDisplay( m_controlHandle, true ); #else @@ -540,7 +540,7 @@ wxToolBarToolBase *wxToolBar::CreateTool( wxToolBarToolBase * wxToolBar::CreateTool( wxControl *control ) { - return new wxToolBarTool(this, control); + return new wxToolBarTool( this, control ); } void wxToolBar::Init() @@ -556,9 +556,246 @@ void wxToolBar::Init() #endif } +#define kControlToolbarItemClassID CFSTR( "org.wxwidgets.controltoolbaritem" ) + +const EventTypeSpec kEvents[] = +{ + { kEventClassHIObject, kEventHIObjectConstruct }, + { kEventClassHIObject, kEventHIObjectInitialize }, + { kEventClassHIObject, kEventHIObjectDestruct }, + + { kEventClassToolbarItem, kEventToolbarItemCreateCustomView } +}; + +const EventTypeSpec kViewEvents[] = +{ + { kEventClassControl, kEventControlGetSizeConstraints } +}; + +struct ControlToolbarItem +{ + HIToolbarItemRef toolbarItem; + HIViewRef viewRef; + wxSize lastValidSize ; +}; + +static pascal OSStatus ControlToolbarItemHandler( EventHandlerCallRef inCallRef, EventRef inEvent, void* inUserData ) +{ + OSStatus result = eventNotHandledErr; + ControlToolbarItem* object = (ControlToolbarItem*)inUserData; + + switch ( GetEventClass( inEvent ) ) + { + case kEventClassHIObject: + switch ( GetEventKind( inEvent ) ) + { + case kEventHIObjectConstruct: + { + HIObjectRef toolbarItem; + ControlToolbarItem* item; + + GetEventParameter( inEvent, kEventParamHIObjectInstance, typeHIObjectRef, NULL, + sizeof( HIObjectRef ), NULL, &toolbarItem ); + + item = (ControlToolbarItem*) malloc(sizeof(ControlToolbarItem)) ; + item->toolbarItem = toolbarItem ; + item->viewRef = NULL ; + + SetEventParameter( inEvent, kEventParamHIObjectInstance, typeVoidPtr, sizeof( void * ), &item ); + + result = noErr ; + } + break; + + case kEventHIObjectInitialize: + result = CallNextEventHandler( inCallRef, inEvent ); + if ( result == noErr ) + { + CFDataRef data; + GetEventParameter( inEvent, kEventParamToolbarItemConfigData, typeCFTypeRef, NULL, + sizeof( CFTypeRef ), NULL, &data ); + + HIViewRef viewRef ; + + wxASSERT_MSG( CFDataGetLength( data ) == sizeof( viewRef ) , wxT("Illegal Data passed") ) ; + memcpy( &viewRef , CFDataGetBytePtr( data ) , sizeof( viewRef ) ) ; + + object->viewRef = (HIViewRef) viewRef ; + + result = noErr ; + } + break; + + case kEventHIObjectDestruct: + free( object ) ; + result = noErr; + break; + } + break; + + case kEventClassToolbarItem: + switch ( GetEventKind( inEvent ) ) + { + case kEventToolbarItemCreateCustomView: + { + HIViewRef viewRef = object->viewRef ; + + HIViewRemoveFromSuperview( viewRef ) ; + HIViewSetVisible(viewRef, true) ; + InstallEventHandler( GetControlEventTarget( viewRef ), ControlToolbarItemHandler, + GetEventTypeCount( kViewEvents ), kViewEvents, object, NULL ); + + result = SetEventParameter( inEvent, kEventParamControlRef, typeControlRef, sizeof( HIViewRef ), &viewRef ); + } + break; + } + break; + + case kEventClassControl: + switch ( GetEventKind( inEvent ) ) + { + case kEventControlGetSizeConstraints: + { + wxWindow* wxwindow = wxFindControlFromMacControl(object->viewRef ) ; + if ( wxwindow ) + { + wxSize sz = wxwindow->GetSize() ; + sz.x -= wxwindow->MacGetLeftBorderSize() + wxwindow->MacGetRightBorderSize(); + sz.y -= wxwindow->MacGetTopBorderSize() + wxwindow->MacGetBottomBorderSize(); + // during toolbar layout the native window sometimes gets negative sizes + // so we always keep the last valid size here, to make sure we survive the + // shuffle ... + if ( sz.x > 0 && sz.y > 0 ) + object->lastValidSize = sz ; + else + sz = object->lastValidSize ; + + HISize min, max; + min.width = max.width = sz.x ; + min.height = max.height = sz.y ; + + result = SetEventParameter( inEvent, kEventParamMinimumSize, typeHISize, + sizeof( HISize ), &min ); + + result = SetEventParameter( inEvent, kEventParamMaximumSize, typeHISize, + sizeof( HISize ), &max ); + result = noErr ; + } + } + break; + } + break; + } + + return result; +} + +void RegisterControlToolbarItemClass() +{ + static bool sRegistered; + + if ( !sRegistered ) + { + HIObjectRegisterSubclass( kControlToolbarItemClassID, kHIToolbarItemClassID, 0, + ControlToolbarItemHandler, GetEventTypeCount( kEvents ), kEvents, 0, NULL ); + + sRegistered = true; + } +} + +HIToolbarItemRef CreateControlToolbarItem(CFStringRef inIdentifier, CFTypeRef inConfigData) +{ + RegisterControlToolbarItemClass(); + + OSStatus err; + EventRef event; + UInt32 options = kHIToolbarItemAllowDuplicates; + HIToolbarItemRef result = NULL; + + err = CreateEvent( NULL, kEventClassHIObject, kEventHIObjectInitialize, GetCurrentEventTime(), 0, &event ); + require_noerr( err, CantCreateEvent ); + + SetEventParameter( event, kEventParamAttributes, typeUInt32, sizeof( UInt32 ), &options ); + SetEventParameter( event, kEventParamToolbarItemIdentifier, typeCFStringRef, sizeof( CFStringRef ), &inIdentifier ); + + if ( inConfigData ) + SetEventParameter( event, kEventParamToolbarItemConfigData, typeCFTypeRef, sizeof( CFTypeRef ), &inConfigData ); + + err = HIObjectCreate( kControlToolbarItemClassID, event, (HIObjectRef*)&result ); + check_noerr( err ); + + ReleaseEvent( event ); +CantCreateEvent : + return result ; +} + +static const EventTypeSpec kToolbarEvents[] = +{ + { kEventClassToolbar, kEventToolbarGetDefaultIdentifiers }, + { kEventClassToolbar, kEventToolbarGetAllowedIdentifiers }, + { kEventClassToolbar, kEventToolbarCreateItemWithIdentifier }, +}; + +static OSStatus ToolbarDelegateHandler( EventHandlerCallRef inCallRef, EventRef inEvent, void* inUserData ) +{ + OSStatus result = eventNotHandledErr; + // Not yet needed + // wxToolBar* toolbar = (wxToolBar*) inUserData ; + CFMutableArrayRef array; + + switch ( GetEventKind( inEvent ) ) + { + case kEventToolbarGetDefaultIdentifiers: + { + GetEventParameter( inEvent, kEventParamMutableArray, typeCFMutableArrayRef, NULL, + sizeof( CFMutableArrayRef ), NULL, &array ); + // not implemented yet + // GetToolbarDefaultItems( array ); + result = noErr; + } + break; + + case kEventToolbarGetAllowedIdentifiers: + { + GetEventParameter( inEvent, kEventParamMutableArray, typeCFMutableArrayRef, NULL, + sizeof( CFMutableArrayRef ), NULL, &array ); + // not implemented yet + // GetToolbarAllowedItems( array ); + result = noErr; + } + break; + case kEventToolbarCreateItemWithIdentifier: + { + HIToolbarItemRef item = NULL; + CFTypeRef data = NULL; + CFStringRef identifier = NULL ; + + GetEventParameter( inEvent, kEventParamToolbarItemIdentifier, typeCFStringRef, NULL, + sizeof( CFStringRef ), NULL, &identifier ); + + GetEventParameter( inEvent, kEventParamToolbarItemConfigData, typeCFTypeRef, NULL, + sizeof( CFTypeRef ), NULL, &data ); + + if ( CFStringCompare( kControlToolbarItemClassID, identifier, kCFCompareBackwards ) == kCFCompareEqualTo ) + { + item = CreateControlToolbarItem( kControlToolbarItemClassID, data ); + if ( item ) + { + SetEventParameter( inEvent, kEventParamToolbarItem, typeHIToolbarItemRef, + sizeof( HIToolbarItemRef ), &item ); + result = noErr; + } + } + + } + break; + } + return result ; +} + // also for the toolbar we have the dual implementation: // only when MacInstallNativeToolbar is called is the native toolbar set as the window toolbar -// + bool wxToolBar::Create( wxWindow *parent, wxWindowID id, @@ -580,6 +817,9 @@ bool wxToolBar::Create( if (m_macHIToolbarRef != NULL) { + InstallEventHandler( HIObjectGetEventTarget((HIToolbarRef)m_macHIToolbarRef ), ToolbarDelegateHandler, + GetEventTypeCount( kToolbarEvents ), kToolbarEvents, this, NULL ); + HIToolbarDisplayMode mode = kHIToolbarDisplayModeDefault; HIToolbarDisplaySize displaySize = kHIToolbarDisplaySizeSmall; @@ -601,13 +841,13 @@ bool wxToolBar::Create( wxToolBar::~wxToolBar() { #if wxMAC_USE_NATIVE_TOOLBAR - if ( m_macHIToolbarRef ) + if (m_macHIToolbarRef != NULL) { // if this is the installed toolbar, then deinstall it if (m_macUsesNativeToolbar) MacInstallNativeToolbar( false ); - CFRelease( (HIToolbarRef) m_macHIToolbarRef ); + CFRelease( (HIToolbarRef)m_macHIToolbarRef ); m_macHIToolbarRef = NULL; } #endif @@ -615,10 +855,9 @@ wxToolBar::~wxToolBar() bool wxToolBar::Show( bool show ) { - bool bResult; WindowRef tlw = MAC_WXHWND(MacGetTopLevelWindowRef()); + bool bResult = (tlw != NULL); - bResult = (tlw != NULL); if (bResult) { #if wxMAC_USE_NATIVE_TOOLBAR @@ -626,14 +865,16 @@ bool wxToolBar::Show( bool show ) MacTopLevelHasNativeToolbar( &ownToolbarInstalled ); if (ownToolbarInstalled) { - bResult = ( IsWindowToolbarVisible( tlw ) != show); + bResult = (IsWindowToolbarVisible( tlw ) != show); if ( bResult ) ShowHideWindowToolbar( tlw, show, false ); } else -#endif - bResult = wxToolBarBase::Show( show ); +#else + + bResult = wxToolBarBase::Show( show ); +#endif } return bResult; @@ -645,6 +886,7 @@ bool wxToolBar::IsShown() const #if wxMAC_USE_NATIVE_TOOLBAR bool ownToolbarInstalled; + MacTopLevelHasNativeToolbar( &ownToolbarInstalled ); if (ownToolbarInstalled) { @@ -652,8 +894,11 @@ bool wxToolBar::IsShown() const bResult = IsWindowToolbarVisible( tlw ); } else -#endif bResult = wxToolBarBase::IsShown(); +#else + + bResult = wxToolBarBase::IsShown(); +#endif return bResult; } @@ -675,8 +920,11 @@ void wxToolBar::DoGetSize( int *width, int *height ) const *height = boundsR.bottom - boundsR.top; } else -#endif wxToolBarBase::DoGetSize( width, height ); + +#else + wxToolBarBase::DoGetSize( width, height ); +#endif } wxSize wxToolBar::DoGetBestSize() const @@ -727,7 +975,7 @@ bool wxToolBar::MacTopLevelHasNativeToolbar(bool *ownToolbarInstalled) const { HIToolbarRef curToolbarRef = NULL; OSStatus err = GetWindowToolbar( tlw, &curToolbarRef ); - bResultV = ((err == 0) && (curToolbarRef != NULL)); + bResultV = ((err == noErr) && (curToolbarRef != NULL)); if (bResultV && (ownToolbarInstalled != NULL)) *ownToolbarInstalled = (curToolbarRef == m_macHIToolbarRef); } @@ -739,16 +987,16 @@ bool wxToolBar::MacInstallNativeToolbar(bool usesNative) { bool bResult = false; - WindowRef tlw = MAC_WXHWND(MacGetTopLevelWindowRef()); - if (tlw == NULL) - return bResult; - if (usesNative && (m_macHIToolbarRef == NULL)) return bResult; if (usesNative && ((GetWindowStyleFlag() & wxTB_VERTICAL) != 0)) return bResult; + WindowRef tlw = MAC_WXHWND(MacGetTopLevelWindowRef()); + if (tlw == NULL) + return bResult; + // check the existing toolbar HIToolbarRef curToolbarRef = NULL; OSStatus err = GetWindowToolbar( tlw, &curToolbarRef ); @@ -817,11 +1065,11 @@ bool wxToolBar::Realize() GetSize( &tw, &th ); // find the maximum tool width and height - wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst(); + wxToolBarTool *tool; + wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst(); while ( node != NULL ) { - wxToolBarTool *tool = (wxToolBarTool *) node->GetData(); - + tool = (wxToolBarTool *) node->GetData(); if ( tool != NULL ) { wxSize sz = tool->GetSize(); @@ -847,8 +1095,7 @@ bool wxToolBar::Realize() node = m_tools.GetFirst(); while ( node != NULL ) { - wxToolBarTool *tool = (wxToolBarTool *) node->GetData(); - + tool = (wxToolBarTool*) node->GetData(); if ( tool == NULL ) { node = node->GetNext(); @@ -906,7 +1153,7 @@ bool wxToolBar::Realize() if (err != noErr) { wxString errMsg = wxString::Format( wxT("HIToolbarRemoveItemAtIndex failed [%ld]"), (long)err ); - wxASSERT_MSG( 0, errMsg.c_str() ); + wxFAIL_MSG( errMsg.c_str() ); } } @@ -914,7 +1161,7 @@ bool wxToolBar::Realize() if (err != noErr) { wxString errMsg = wxString::Format( wxT("HIToolbarInsertItemAtIndex failed [%ld]"), (long)err ); - wxASSERT_MSG( 0, errMsg.c_str() ); + wxFAIL_MSG( errMsg.c_str() ); } tool->SetIndex( currentPosition ); @@ -1060,17 +1307,18 @@ void wxToolBar::MacSuperChangedPosition() if (! m_macUsesNativeToolbar ) Realize(); #else + Realize(); #endif } wxToolBarToolBase *wxToolBar::FindToolForPosition(wxCoord x, wxCoord y) const { + wxToolBarTool *tool; wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst(); while ( node != NULL ) { - wxToolBarTool *tool = (wxToolBarTool *)node->GetData(); - + tool = (wxToolBarTool *)node->GetData(); if (tool != NULL) { wxRect2DInt r( tool->GetPosition(), tool->GetSize() ); @@ -1081,7 +1329,7 @@ wxToolBarToolBase *wxToolBar::FindToolForPosition(wxCoord x, wxCoord y) const node = node->GetNext(); } - return (wxToolBarToolBase *)NULL; + return (wxToolBarToolBase*)NULL; } wxString wxToolBar::MacGetToolTipString( wxPoint &pt ) @@ -1176,8 +1424,9 @@ bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos), wxToolBarToolBase *toolBase) kHIToolbarItemCantBeRemoved | kHIToolbarItemAnchoredLeft | kHIToolbarItemAllowDuplicates, &item ); if (err == noErr) { - InstallEventHandler( HIObjectGetEventTarget(item), GetwxMacToolBarEventHandlerUPP(), - GetEventTypeCount(toolBarEventList), toolBarEventList, tool, NULL ); + InstallEventHandler( + HIObjectGetEventTarget(item), GetwxMacToolBarEventHandlerUPP(), + GetEventTypeCount(toolBarEventList), toolBarEventList, tool, NULL ); HIToolbarItemSetLabel( item, wxMacCFStringHolder(tool->GetLabel(), m_font.GetEncoding()) ); HIToolbarItemSetIconRef( item, info.u.iconRef ); HIToolbarItemSetCommandID( item, kHIToolbarCommandPressAction ); @@ -1186,6 +1435,7 @@ bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos), wxToolBarToolBase *toolBase) #endif wxMacReleaseBitmapButton( &info ); + #if 0 SetBevelButtonTextPlacement( m_controlHandle, kControlBevelButtonPlaceBelowGraphic ); UMASetControlTitle( m_controlHandle, label, wxFont::GetDefaultEncoding() ); @@ -1200,39 +1450,28 @@ bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos), wxToolBarToolBase *toolBase) break; case wxTOOL_STYLE_CONTROL: - wxASSERT( tool->GetControl() != NULL ); -#if 0 // wxMAC_USE_NATIVE_TOOLBAR - // FIXME: doesn't work yet... +#if wxMAC_USE_NATIVE_TOOLBAR { + wxASSERT( tool->GetControl() != NULL ); HIToolbarItemRef item; - wxString labelStr = wxString::Format( wxT("%xd"), (int)tool ); - result = HIToolbarItemCreate( - wxMacCFStringHolder( labelStr, wxFont::GetDefaultEncoding() ), - kHIToolbarItemCantBeRemoved | kHIToolbarItemAnchoredLeft | kHIToolbarItemAllowDuplicates, - &item ); - if ( result == noErr ) + HIViewRef viewRef = (HIViewRef) tool->GetControl()->GetHandle() ; + // as this control now is part of both the wxToolBar children and the native toolbar, we have to increase the + // reference count to make sure we are not dealing with zombie controls after the native toolbar has released its views + CFRetain( viewRef ) ; + CFDataRef data = CFDataCreate( kCFAllocatorDefault , (UInt8*) &viewRef , sizeof(viewRef) ) ; + err = HIToolbarCreateItemWithIdentifier((HIToolbarRef) m_macHIToolbarRef,kControlToolbarItemClassID, + data , &item ) ; + + if (err == noErr) { - HIToolbarItemSetLabel( item, wxMacCFStringHolder( tool->GetLabel(), m_font.GetEncoding() ) ); - HIToolbarItemSetCommandID( item, tool->GetId() ); tool->SetToolbarItemRef( item ); - - controlHandle = ( ControlRef ) tool->GetControlHandle(); - wxASSERT_MSG( controlHandle != NULL, wxT("NULL tool control") ); - - // FIXME: is this necessary ?? - ::GetControlBounds( controlHandle, &toolrect ); - UMAMoveControl( controlHandle, -toolrect.left, -toolrect.top ); - - // FIXME: is this necessary ?? - InstallControlEventHandler( - controlHandle, GetwxMacToolBarToolEventHandlerUPP(), - GetEventTypeCount(eventList), eventList, tool, NULL ); } - } + CFRelease( data ) ; + } #else - // FIXME: right now there's nothing to do here + // right now there's nothing to do here #endif break; @@ -1261,7 +1500,7 @@ bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos), wxToolBarToolBase *toolBase) else { wxString errMsg = wxString::Format( wxT("wxToolBar::DoInsertTool - failure [%ld]"), (long)err ); - wxASSERT_MSG( false, errMsg.c_str() ); + wxFAIL_MSG( errMsg.c_str() ); } return (err == noErr); @@ -1309,8 +1548,6 @@ bool wxToolBar::DoDeleteTool(size_t WXUNUSED(pos), wxToolBarToolBase *toolbase) case wxTOOL_STYLE_SEPARATOR: if ( tool->GetControlHandle() ) { - DisposeControl( (ControlRef) tool->GetControlHandle() ); - #if wxMAC_USE_NATIVE_TOOLBAR if ( removeIndex != -1 && m_macHIToolbarRef ) {