X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6d4835dccb5a263539110214ce6445b935cc1ff6..a7868cdf6a8782a04a46791dd63de2ade825a8bc:/src/mac/carbon/toolbar.cpp diff --git a/src/mac/carbon/toolbar.cpp b/src/mac/carbon/toolbar.cpp index 958f7127f7..997a557d1b 100644 --- a/src/mac/carbon/toolbar.cpp +++ b/src/mac/carbon/toolbar.cpp @@ -79,7 +79,7 @@ public: SetControlHandle( (ControlRef) control->GetHandle() ); } - ~wxToolBarTool() + virtual ~wxToolBarTool() { ClearControl(); @@ -106,7 +106,12 @@ public: m_control = NULL; if ( m_controlHandle ) { - DisposeControl( m_controlHandle ); + if ( !IsControl() ) + DisposeControl( m_controlHandle ); + else + { + // the embedded control is not under the responsibility of the tool + } m_controlHandle = NULL ; } @@ -387,8 +392,6 @@ void wxToolBarTool::SetPosition( const wxPoint& position ) m_x = position.x; m_y = position.y; - int x, y; - x = y = 0; int mac_x = position.x; int mac_y = position.y; @@ -407,7 +410,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 { @@ -426,33 +435,6 @@ void wxToolBarTool::SetPosition( const wxPoint& position ) 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) -#endif - - // FIXME: this should be a OSX v10.4 runtime check - if (m_toolbarItemRef != NULL) - { - OptionBits addAttrs, removeAttrs; - OSStatus result; - - if (toggle) - { - addAttrs = kHIToolbarItemSelected; - removeAttrs = kHIToolbarItemNoAttributes; - } - else - { - addAttrs = kHIToolbarItemNoAttributes; - removeAttrs = kHIToolbarItemSelected; - } - - result = HIToolbarItemChangeAttributes( m_toolbarItemRef, addAttrs, removeAttrs ); - } -#endif - #ifdef __WXMAC_OSX__ if ( toggle ) { @@ -462,14 +444,20 @@ void wxToolBarTool::UpdateToggleImage( bool toggle ) wxMemoryDC dc; dc.SelectObject( bmp ); - dc.SetPen( wxNullPen ); - dc.SetBackground( *wxWHITE ); + dc.SetPen( wxPen(*wxBLACK) ); + dc.SetBrush( wxBrush( *wxLIGHT_GREY )); dc.DrawRectangle( 0, 0, w, h ); dc.DrawBitmap( m_bmpNormal, 0, 0, true ); dc.SelectObject( wxNullBitmap ); ControlButtonContentInfo info; wxMacCreateBitmapButton( &info, bmp ); SetControlData( m_controlHandle, 0, kControlIconContentTag, sizeof(info), (Ptr)&info ); +#if wxMAC_USE_NATIVE_TOOLBAR + if (m_toolbarItemRef != NULL) + { + HIToolbarItemSetIconRef( m_toolbarItemRef, info.u.iconRef ); + } +#endif wxMacReleaseBitmapButton( &info ); } else @@ -477,6 +465,12 @@ void wxToolBarTool::UpdateToggleImage( bool toggle ) ControlButtonContentInfo info; wxMacCreateBitmapButton( &info, m_bmpNormal ); SetControlData( m_controlHandle, 0, kControlIconContentTag, sizeof(info), (Ptr)&info ); +#if wxMAC_USE_NATIVE_TOOLBAR + if (m_toolbarItemRef != NULL) + { + HIToolbarItemSetIconRef( m_toolbarItemRef, info.u.iconRef ); + } +#endif wxMacReleaseBitmapButton( &info ); } @@ -545,15 +539,15 @@ void wxToolBar::Init() #endif } -#define kControlToolbarItemClassID CFSTR( "org.wxwidgets.controltoolbaritem" ) +#define kControlToolbarItemClassID CFSTR( "org.wxwidgets.controltoolbaritem" ) const EventTypeSpec kEvents[] = { - { kEventClassHIObject, kEventHIObjectConstruct }, - { kEventClassHIObject, kEventHIObjectInitialize }, - { kEventClassHIObject, kEventHIObjectDestruct }, - - { kEventClassToolbarItem, kEventToolbarItemCreateCustomView } + { kEventClassHIObject, kEventHIObjectConstruct }, + { kEventClassHIObject, kEventHIObjectInitialize }, + { kEventClassHIObject, kEventHIObjectDestruct }, + + { kEventClassToolbarItem, kEventToolbarItemCreateCustomView } }; const EventTypeSpec kViewEvents[] = @@ -570,40 +564,40 @@ struct ControlToolbarItem 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, + 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 ); + SetEventParameter( inEvent, kEventParamHIObjectInstance, typeVoidPtr, sizeof( void * ), &item ); result = noErr ; - } - break; + } + break; case kEventHIObjectInitialize: result = CallNextEventHandler( inCallRef, inEvent ); - if ( result == noErr ) + 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") ) ; @@ -611,22 +605,22 @@ static pascal OSStatus ControlToolbarItemHandler( EventHandlerCallRef inCallRef, object->viewRef = (HIViewRef) viewRef ; - result = noErr ; - } + result = noErr ; + } break; - case kEventHIObjectDestruct: + case kEventHIObjectDestruct: free( object ) ; - result = noErr; - break; - } - break; - - case kEventClassToolbarItem: - switch ( GetEventKind( inEvent ) ) - { - case kEventToolbarItemCreateCustomView: - { + result = noErr; + break; + } + break; + + case kEventClassToolbarItem: + switch ( GetEventKind( inEvent ) ) + { + case kEventToolbarItemCreateCustomView: + { HIViewRef viewRef = object->viewRef ; HIViewRemoveFromSuperview( viewRef ) ; @@ -635,20 +629,22 @@ static pascal OSStatus ControlToolbarItemHandler( EventHandlerCallRef inCallRef, GetEventTypeCount( kViewEvents ), kViewEvents, object, NULL ); result = SetEventParameter( inEvent, kEventParamControlRef, typeControlRef, sizeof( HIViewRef ), &viewRef ); - } - break; - } - break; - - case kEventClassControl: - switch ( GetEventKind( inEvent ) ) - { - case kEventControlGetSizeConstraints: - { + } + 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 ... @@ -668,100 +664,102 @@ static pascal OSStatus ControlToolbarItemHandler( EventHandlerCallRef inCallRef, sizeof( HISize ), &max ); result = noErr ; } - } - break; - } - break; - } - - return result; + } + break; + } + break; + } + + return result; } void RegisterControlToolbarItemClass() { - static bool sRegistered; - - if ( !sRegistered ) - { - HIObjectRegisterSubclass( kControlToolbarItemClassID, kHIToolbarItemClassID, 0, - ControlToolbarItemHandler, GetEventTypeCount( kEvents ), kEvents, 0, NULL ); - - sRegistered = true; - } + static bool sRegistered; + + if ( !sRegistered ) + { + HIObjectRegisterSubclass( kControlToolbarItemClassID, kHIToolbarItemClassID, 0, + ControlToolbarItemHandler, GetEventTypeCount( kEvents ), kEvents, 0, NULL ); + + sRegistered = true; + } } HIToolbarItemRef CreateControlToolbarItem(CFStringRef inIdentifier, CFTypeRef inConfigData) { - RegisterControlToolbarItemClass(); + 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 ); - 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 ; + ReleaseEvent( event ); +CantCreateEvent : + return result ; } +#if wxMAC_USE_NATIVE_TOOLBAR static const EventTypeSpec kToolbarEvents[] = { - { kEventClassToolbar, kEventToolbarGetDefaultIdentifiers }, - { kEventClassToolbar, kEventToolbarGetAllowedIdentifiers }, - { kEventClassToolbar, kEventToolbarCreateItemWithIdentifier }, + { kEventClassToolbar, kEventToolbarGetDefaultIdentifiers }, + { kEventClassToolbar, kEventToolbarGetAllowedIdentifiers }, + { kEventClassToolbar, kEventToolbarCreateItemWithIdentifier }, }; static OSStatus ToolbarDelegateHandler( EventHandlerCallRef inCallRef, EventRef inEvent, void* inUserData ) { - OSStatus result = eventNotHandledErr; - wxToolBar* toolbar = (wxToolBar*) inUserData ; - CFMutableArrayRef array; + OSStatus result = eventNotHandledErr; + // Not yet needed + // wxToolBar* toolbar = (wxToolBar*) inUserData ; + CFMutableArrayRef array; - switch ( GetEventKind( inEvent ) ) - { - case kEventToolbarGetDefaultIdentifiers: + switch ( GetEventKind( inEvent ) ) + { + case kEventToolbarGetDefaultIdentifiers: { GetEventParameter( inEvent, kEventParamMutableArray, typeCFMutableArrayRef, NULL, - sizeof( CFMutableArrayRef ), NULL, &array ); + sizeof( CFMutableArrayRef ), NULL, &array ); // not implemented yet // GetToolbarDefaultItems( array ); result = noErr; } - break; - - case kEventToolbarGetAllowedIdentifiers: + break; + + case kEventToolbarGetAllowedIdentifiers: { GetEventParameter( inEvent, kEventParamMutableArray, typeCFMutableArrayRef, NULL, - sizeof( CFMutableArrayRef ), NULL, &array ); + sizeof( CFMutableArrayRef ), NULL, &array ); // not implemented yet // GetToolbarAllowedItems( array ); result = noErr; } - break; - case kEventToolbarCreateItemWithIdentifier: - { - HIToolbarItemRef item = NULL; - CFTypeRef data = NULL; + 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 ); - + + 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 ); @@ -771,13 +769,14 @@ static OSStatus ToolbarDelegateHandler( EventHandlerCallRef inCallRef, EventRef sizeof( HIToolbarItemRef ), &item ); result = noErr; } - } + } - } - break; + } + break; } return result ; } +#endif // wxMAC_USE_NATIVE_TOOLBAR // also for the toolbar we have the dual implementation: // only when MacInstallNativeToolbar is called is the native toolbar set as the window toolbar @@ -803,8 +802,8 @@ bool wxToolBar::Create( if (m_macHIToolbarRef != NULL) { - InstallEventHandler( HIObjectGetEventTarget((HIToolbarRef)m_macHIToolbarRef ), ToolbarDelegateHandler, - GetEventTypeCount( kToolbarEvents ), kToolbarEvents, this, NULL ); + InstallEventHandler( HIObjectGetEventTarget((HIToolbarRef)m_macHIToolbarRef ), ToolbarDelegateHandler, + GetEventTypeCount( kToolbarEvents ), kToolbarEvents, this, NULL ); HIToolbarDisplayMode mode = kHIToolbarDisplayModeDefault; HIToolbarDisplaySize displaySize = kHIToolbarDisplaySizeSmall; @@ -1071,7 +1070,6 @@ bool wxToolBar::Realize() bool lastIsRadio = false; bool curIsRadio = false; - bool setChoiceInGroup = false; #if wxMAC_USE_NATIVE_TOOLBAR CFIndex currentPosition = 0; @@ -1166,8 +1164,6 @@ bool wxToolBar::Realize() { if ( tool->IsToggled() ) DoToggleTool( tool, true ); - - setChoiceInGroup = false; } else { @@ -1176,7 +1172,6 @@ bool wxToolBar::Realize() if ( tool->Toggle( true ) ) { DoToggleTool( tool, true ); - setChoiceInGroup = true; } } else if ( tool->IsToggled() ) @@ -1245,7 +1240,7 @@ bool wxToolBar::Realize() InvalidateBestSize(); #endif - SetBestFittingSize(); + SetInitialSize(); return true; } @@ -1439,9 +1434,12 @@ bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos), wxToolBarToolBase *toolBase) #if wxMAC_USE_NATIVE_TOOLBAR { - wxASSERT( tool->GetControl() != NULL ); + wxASSERT( tool->GetControl() != NULL ); HIToolbarItemRef item; 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 ) ; @@ -1650,7 +1648,9 @@ void wxToolBar::OnPaint(wxPaintEvent& event) drawInfo.kind = kThemeBackgroundMetal; HIThemeApplyBackground( &hiToolbarrect, &drawInfo, cgContext, kHIThemeOrientationNormal ); +#ifndef __LP64__ QDEndCGContext( (CGrafPtr) dc.m_macPort, &cgContext ); +#endif #endif } }