equal
deleted
inserted
replaced
528 [item setEnabled:menu->qmenu->isEnabled() && action->isEnabled()]; |
528 [item setEnabled:menu->qmenu->isEnabled() && action->isEnabled()]; |
529 [item setState:action->isChecked() ? NSOnState : NSOffState]; |
529 [item setState:action->isChecked() ? NSOnState : NSOffState]; |
530 [item setToolTip:(NSString*)QCFString::toCFStringRef(action->toolTip())]; |
530 [item setToolTip:(NSString*)QCFString::toCFStringRef(action->toolTip())]; |
531 const QIcon icon = action->icon(); |
531 const QIcon icon = action->icon(); |
532 if(!icon.isNull()) { |
532 if(!icon.isNull()) { |
|
533 #ifndef QT_MAC_USE_COCOA |
|
534 const short scale = GetMBarHeight(); |
|
535 #else |
533 const short scale = [[NSApp mainMenu] menuBarHeight]; |
536 const short scale = [[NSApp mainMenu] menuBarHeight]; |
|
537 #endif |
534 NSImage *nsimage = static_cast<NSImage *>(qt_mac_create_nsimage(icon.pixmap(QSize(scale, scale)))); |
538 NSImage *nsimage = static_cast<NSImage *>(qt_mac_create_nsimage(icon.pixmap(QSize(scale, scale)))); |
535 [item setImage: nsimage]; |
539 [item setImage: nsimage]; |
536 [nsimage release]; |
540 [nsimage release]; |
537 } |
541 } |
538 if(action->menu()) { |
542 if(action->menu()) { |