X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a9412f8f03171fdd3606a4ad3db9c9da8fe6bd7c..86dc230162aae002d7a0cdf862841b89f6928396:/src/mac/carbon/menu.cpp diff --git a/src/mac/carbon/menu.cpp b/src/mac/carbon/menu.cpp index 9a04c36935..f4f6330016 100644 --- a/src/mac/carbon/menu.cpp +++ b/src/mac/carbon/menu.cpp @@ -18,7 +18,7 @@ // headers & declarations // ============================================================================ -// wxWindows headers +// wxWidgets headers // ----------------- #include "wx/app.h" @@ -41,12 +41,42 @@ IMPLEMENT_DYNAMIC_CLASS(wxMenuBar, wxEvtHandler) #endif // the (popup) menu title has this special id -static const int idMenuTitle = -2; +static const int idMenuTitle = -3; static MenuItemIndex firstUserHelpMenuItem = 0 ; const short kwxMacMenuBarResource = 1 ; const short kwxMacAppleMenuId = 1 ; + +// Find an item given the Macintosh Menu Reference + +wxList wxWinMacMenuList(wxKEY_INTEGER); +wxMenu *wxFindMenuFromMacMenu(MenuRef inMenuRef) +{ + wxNode *node = wxWinMacMenuList.Find((long)inMenuRef); + if (!node) + return NULL; + return (wxMenu *)node->GetData(); +} + +void wxAssociateMenuWithMacMenu(MenuRef inMenuRef, wxMenu *menu) ; +void wxAssociateMenuWithMacMenu(MenuRef inMenuRef, wxMenu *menu) +{ + // adding NULL MenuRef is (first) surely a result of an error and + // (secondly) breaks menu command processing + wxCHECK_RET( inMenuRef != (MenuRef) NULL, wxT("attempt to add a NULL MenuRef to menu list") ); + + if ( !wxWinMacMenuList.Find((long)inMenuRef) ) + wxWinMacMenuList.Append((long)inMenuRef, menu); +} + +void wxRemoveMacMenuAssociation(wxMenu *menu) ; +void wxRemoveMacMenuAssociation(wxMenu *menu) +{ + wxWinMacMenuList.DeleteObject(menu); +} + + // ============================================================================ // implementation // ============================================================================ @@ -77,6 +107,8 @@ void wxMenu::Init() wxLogLastError(wxT("UMANewMenu failed")); } + wxAssociateMenuWithMacMenu( (MenuRef)m_hMenu , this ) ; + // if we have a title, insert it in the beginning of the menu if ( !!m_title ) { @@ -87,6 +119,7 @@ void wxMenu::Init() wxMenu::~wxMenu() { + wxRemoveMacMenuAssociation( this ) ; if (MAC_WXHMENU(m_hMenu)) ::DisposeMenu(MAC_WXHMENU(m_hMenu)); } @@ -124,7 +157,7 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos) wxASSERT_MSG( pSubMenu->m_hMenu != NULL , wxT("invalid submenu added")); pSubMenu->m_menuParent = this ; - if (wxMenuBar::MacGetInstalledMenuBar() == m_menuBar) + if (wxMenuBar::MacGetInstalledMenuBar() == GetMenuBar()) { pSubMenu->MacBeforeDisplay( true ) ; } @@ -153,6 +186,7 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos) } SetMenuItemCommandID( MAC_WXHMENU(m_hMenu) , pos , pItem->GetId() ) ; + SetMenuItemRefCon( MAC_WXHMENU(m_hMenu) , pos , (UInt32) pItem ) ; pItem->UpdateItemText() ; pItem->UpdateItemBitmap() ; pItem->UpdateItemStatus() ; @@ -166,7 +200,7 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos) // if we're already attached to the menubar, we must update it if ( IsAttached() ) { - m_menuBar->Refresh(); + GetMenuBar()->Refresh(); } return TRUE ; } @@ -263,7 +297,7 @@ wxMenuItem *wxMenu::DoRemove(wxMenuItem *item) if ( IsAttached() ) { // otherwise, the change won't be visible - m_menuBar->Refresh(); + GetMenuBar()->Refresh(); } // and from internal data structures @@ -303,8 +337,8 @@ wxWindow *wxMenu::GetWindow() const { if ( m_invokingWindow != NULL ) return m_invokingWindow; - else if ( m_menuBar != NULL) - return (wxWindow *) m_menuBar->GetFrame(); + else if ( GetMenuBar() != NULL) + return (wxWindow *) GetMenuBar()->GetFrame(); return NULL; } @@ -372,23 +406,64 @@ void wxMenu::MacBeforeDisplay( bool isSubMenu ) { subMenu->MacBeforeDisplay( true ) ; } - else + else // normal item { #if TARGET_CARBON if ( UMAGetSystemVersion() >= 0x1000 ) { - if ( item->GetId() == wxApp::s_macPreferencesMenuItemId || item->GetId() == wxApp::s_macExitMenuItemId) + // what we do here is to hide the special items which are + // shown in the application menu anyhow -- it doesn't make + // sense to show them in their normal place as well + if ( item->GetId() == wxApp::s_macPreferencesMenuItemId || + item->GetId() == wxApp::s_macExitMenuItemId ) { - ChangeMenuItemAttributes( MAC_WXHMENU( GetHMenu() ) , pos + 1, kMenuItemAttrHidden, 0 ); - if ( GetMenuItems().GetCount() == pos + 1 && - previousItem != NULL && - previousItem->IsSeparator() ) + ChangeMenuItemAttributes( MAC_WXHMENU( GetHMenu() ), + pos + 1, kMenuItemAttrHidden, 0 ); + + // also check for a separator which was used just to + // separate this item from the others, so don't leave + // separator at the menu start or end nor 2 consecutive + // separators + wxMenuItemList::Node *nextNode = node->GetNext(); + wxMenuItem *next = nextNode ? nextNode->GetData() : NULL; + + size_t posSeptoHide; + if ( !previousItem && next && next->IsSeparator() ) + { + // next (i.e. second as we must be first) item is + // the separator to hide + wxASSERT_MSG( pos == 0, _T("should be the menu start") ); + posSeptoHide = 2; + } + else if ( GetMenuItems().GetCount() == pos + 1 && + previousItem != NULL && + previousItem->IsSeparator() ) { - ChangeMenuItemAttributes( MAC_WXHMENU( GetHMenu() ) , pos , kMenuItemAttrHidden, 0 ); + // prev item is a trailing separator we want to hide + posSeptoHide = pos; + } + else if ( previousItem && previousItem->IsSeparator() && + next && next->IsSeparator() ) + { + // two consecutive separators, this is one too many + posSeptoHide = pos; + } + else // no separators to hide + { + posSeptoHide = 0; + } + + if ( posSeptoHide ) + { + // hide the separator as well + ChangeMenuItemAttributes( MAC_WXHMENU( GetHMenu() ), + posSeptoHide, + kMenuItemAttrHidden, + 0 ); } } } - #endif + #endif // TARGET_CARBON } previousItem = item ; } @@ -502,26 +577,31 @@ void wxMenuBar::MacInstallMenuBar() if ( s_macInstalledMenuBar == this ) return ; - wxStAppResource resload ; - - Handle menubar = ::GetNewMBar( kwxMacMenuBarResource ) ; - wxString message ; - wxCHECK_RET( menubar != NULL, wxT("can't read MBAR resource") ); - ::SetMenuBar( menubar ) ; -#if TARGET_API_MAC_CARBON - ::DisposeMenuBar( menubar ) ; + MenuBarHandle menubar = NULL ; +#if TARGET_API_MAC_OSX + menubar = NewHandleClear( 6 /* sizeof( MenuBarHeader ) */ ) ; #else - ::DisposeHandle( menubar ) ; + menubar = NewHandleClear( 12 ) ; + (*menubar)[3] = 0x0a ; #endif - -#if TARGET_API_MAC_OS8 - MenuHandle menu = ::GetMenuHandle( kwxMacAppleMenuId ) ; - if ( CountMenuItems( menu ) == 2 ) - { - ::AppendResMenu(menu, 'DRVR'); - } + ::SetMenuBar( menubar ) ; + DisposeMenuBar( menubar ) ; + MenuHandle appleMenu = NULL ; + char appleMenuTitle[3] = { 01 , kMenuAppleLogoFilledGlyph , 0 } ; + + verify_noerr( CreateNewMenu( kwxMacAppleMenuId , 0 , &appleMenu ) ) ; + verify_noerr( SetMenuTitle( appleMenu , (ConstStr255Param) appleMenuTitle ) ); + + // Add About/Preferences separator only on OS X + // KH/RN: Separator is always present on 10.3 but not on 10.2 + // However, the change from 10.2 to 10.3 suggests it is preferred +#if TARGET_API_MAC_OSX + MacInsertMenuItem( appleMenu , "\p-" , 0 ) ; #endif + MacInsertMenuItem( appleMenu , "\pAbout..." , 0 ) ; + MacInsertMenu( appleMenu , 0 ) ; + // clean-up the help menu before adding new items MenuHandle mh = NULL ; if ( UMAGetHelpMenu( &mh , &firstUserHelpMenuItem) == noErr ) @@ -583,6 +663,7 @@ void wxMenuBar::MacInstallMenuBar() UMASetMenuItemText( GetMenuHandle( kwxMacAppleMenuId ) , 1 , item->GetText() , wxFont::GetDefaultEncoding() ); UMAEnableMenuItem( GetMenuHandle( kwxMacAppleMenuId ) , 1 , true ); SetMenuItemCommandID( GetMenuHandle( kwxMacAppleMenuId ) , 1 , item->GetId() ) ; + SetMenuItemRefCon(GetMenuHandle( kwxMacAppleMenuId ) , 1 , (UInt32)item ) ; UMASetMenuItemShortcut( GetMenuHandle( kwxMacAppleMenuId ) , 1 , entry ) ; } else @@ -591,6 +672,7 @@ void wxMenuBar::MacInstallMenuBar() { UMAAppendMenuItem(mh, item->GetText() , wxFont::GetDefaultEncoding(), entry); SetMenuItemCommandID( mh , CountMenuItems(mh) , item->GetId() ) ; + SetMenuItemRefCon( mh , CountMenuItems(mh) , (UInt32)item ) ; } } @@ -617,6 +699,17 @@ void wxMenuBar::EnableTop(size_t pos, bool enable) Refresh(); } +bool wxMenuBar::Enable( bool enable) +{ + wxCHECK_MSG( IsAttached(), false, wxT("doesn't work with unattached menubars") ); + size_t i; + for (i = 0; i < GetMenuCount(); i++) + { + EnableTop(i, enable); + } + return true; +} + void wxMenuBar::SetLabelTop(size_t pos, const wxString& label) { wxCHECK_RET( pos < GetMenuCount(), wxT("invalid menu index") ); @@ -856,7 +949,7 @@ int wxMenuBar::FindMenuItem(const wxString& menuString, for ( size_t i = 0; i < count; i++ ) { wxString title = wxStripMenuCodes(m_titles[i]); - if ( menuString == title ) + if ( menuLabel == title ) return m_menus[i]->FindItem(itemString); }