#include "wx/log.h"
#include "wx/app.h"
#include "wx/utils.h"
- #include "wx/window.h"
#include "wx/frame.h"
+ #include "wx/menuitem.h"
#endif
-#include "wx/menuitem.h"
-#include "wx/log.h"
-
#include "wx/mac/uma.h"
// other standard headers
// the (popup) menu title has this special id
static const int idMenuTitle = -3;
-const short kwxMacMenuBarResource = 1 ;
-const short kwxMacAppleMenuId = 1 ;
+static const short kwxMacAppleMenuId = 1 ;
// Find an item given the Macintosh Menu Reference
}
}
+void wxInsertMenuItemsInMenu(wxMenu* menu, MenuRef wm, MenuItemIndex insertAfter)
+{
+ wxMenuItemList::compatibility_iterator node;
+ wxMenuItem *item;
+ wxMenu *subMenu = NULL ;
+ bool newItems = false;
+
+ for (node = menu->GetMenuItems().GetFirst(); node; node = node->GetNext())
+ {
+ item = (wxMenuItem *)node->GetData();
+ subMenu = item->GetSubMenu() ;
+ if (subMenu)
+ {
+ wxInsertMenuItemsInMenu(subMenu, (MenuRef)subMenu->GetHMenu(), 0);
+ }
+ if ( item->IsSeparator() )
+ {
+ if ( wm && newItems)
+ InsertMenuItemTextWithCFString( wm,
+ CFSTR(""), insertAfter, kMenuItemAttrSeparator, 0);
+
+ newItems = false;
+ }
+ else
+ {
+ wxAcceleratorEntry*
+ entry = wxAcceleratorEntry::Create( item->GetText() ) ;
+
+ MenuItemIndex winListPos = (MenuItemIndex)-1;
+ OSStatus err = GetIndMenuItemWithCommandID(wm,
+ wxIdToMacCommand ( item->GetId() ), 1, NULL, &winListPos);
+
+ if ( wm && err == menuItemNotFoundErr )
+ {
+ // NB: the only way to determine whether or not we should add
+ // a separator is to know if we've added menu items to the menu
+ // before the separator.
+ newItems = true;
+ UMAInsertMenuItem(wm, wxStripMenuCodes(item->GetText()) , wxFont::GetDefaultEncoding(), insertAfter, entry);
+ SetMenuItemCommandID( wm , insertAfter+1 , wxIdToMacCommand ( item->GetId() ) ) ;
+ SetMenuItemRefCon( wm , insertAfter+1 , (URefCon) item ) ;
+ }
+
+ delete entry ;
+ }
+ }
+}
+
// ============================================================================
// implementation
// ============================================================================
if ( pItem->IsSeparator() )
{
if ( pos == (size_t)-1 )
- MacAppendMenu(MAC_WXHMENU(m_hMenu), "\p-");
+ AppendMenuItemTextWithCFString( MAC_WXHMENU(m_hMenu),
+ CFSTR(""), kMenuItemAttrSeparator, 0,NULL);
else
- MacInsertMenuItem(MAC_WXHMENU(m_hMenu), "\p-" , pos);
+ InsertMenuItemTextWithCFString( MAC_WXHMENU(m_hMenu),
+ CFSTR(""), pos, kMenuItemAttrSeparator, 0);
}
else
{
}
SetMenuItemCommandID( MAC_WXHMENU(m_hMenu) , pos , wxIdToMacCommand ( pItem->GetId() ) ) ;
- SetMenuItemRefCon( MAC_WXHMENU(m_hMenu) , pos , (UInt32) pItem ) ;
+ SetMenuItemRefCon( MAC_WXHMENU(m_hMenu) , pos , (URefCon) pItem ) ;
pItem->UpdateItemText() ;
pItem->UpdateItemBitmap() ;
pItem->UpdateItemStatus() ;
if ( isSubMenu )
::DeleteMenu(MacGetMenuId());
- wxMenuItem* previousItem = NULL ;
wxMenuItemList::compatibility_iterator node;
wxMenuItem *item;
- int pos ;
- for (pos = 0, node = GetMenuItems().GetFirst(); node; node = node->GetNext(), pos++)
+ for (node = GetMenuItems().GetFirst(); node; node = node->GetNext())
{
item = (wxMenuItem *)node->GetData();
wxMenu* subMenu = item->GetSubMenu() ;
{
// no need to undo hidings
}
-
- previousItem = item ;
}
}
::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 ) );
+ verify_noerr( SetMenuTitleWithCFString( appleMenu , CFSTR( "\x14" ) ) );
// 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 ) ;
+ InsertMenuItemTextWithCFString( appleMenu,
+ CFSTR(""), 0, kMenuItemAttrSeparator, 0);
#endif
-
- MacInsertMenuItem( appleMenu , "\pAbout..." , 0 ) ;
+ InsertMenuItemTextWithCFString( appleMenu,
+ CFSTR("About..."), 0, 0, 0);
MacInsertMenu( appleMenu , 0 ) ;
- // clean-up the help menu before adding new items
- static MenuHandle mh = NULL ;
+ // if we have a mac help menu, clean it up before adding new items
+ MenuHandle helpMenuHandle ;
+ MenuItemIndex firstUserHelpMenuItem ;
- if ( mh != NULL )
+ if ( UMAGetHelpMenuDontCreate( &helpMenuHandle , &firstUserHelpMenuItem) == noErr )
{
- MenuItemIndex firstUserHelpMenuItem ;
- if ( UMAGetHelpMenu( &mh , &firstUserHelpMenuItem) == noErr )
- {
- for ( int i = CountMenuItems( mh ) ; i >= firstUserHelpMenuItem ; --i )
- DeleteMenuItem( mh , i ) ;
- }
- else
- {
- mh = NULL ;
- }
+ for ( int i = CountMenuItems( helpMenuHandle ) ; i >= firstUserHelpMenuItem ; --i )
+ DeleteMenuItem( helpMenuHandle , i ) ;
+ }
+ else
+ {
+ helpMenuHandle = NULL ;
}
#if TARGET_CARBON
}
#endif
+ wxString strippedHelpMenuTitle = wxStripMenuCodes( wxApp::s_macHelpMenuTitleName ) ;
+ wxString strippedTranslatedHelpMenuTitle = wxStripMenuCodes( wxString( _("&Help") ) ) ;
wxMenuList::compatibility_iterator menuIter = m_menus.GetFirst();
for (size_t i = 0; i < m_menus.GetCount(); i++, menuIter = menuIter->GetNext())
{
wxMenuItemList::compatibility_iterator node;
wxMenuItem *item;
- int pos ;
wxMenu* menu = menuIter->GetData() , *subMenu = NULL ;
+ wxString strippedMenuTitle = wxStripMenuCodes(m_titles[i]);
- if ( m_titles[i] == wxT("?") || m_titles[i] == wxT("&?") || m_titles[i] == wxApp::s_macHelpMenuTitleName )
+ if ( strippedMenuTitle == wxT("?") || strippedMenuTitle == strippedHelpMenuTitle || strippedMenuTitle == strippedTranslatedHelpMenuTitle )
{
- for (pos = 0 , node = menu->GetMenuItems().GetFirst(); node; node = node->GetNext(), pos++)
+ for (node = menu->GetMenuItems().GetFirst(); node; node = node->GetNext())
{
item = (wxMenuItem *)node->GetData();
subMenu = item->GetSubMenu() ;
{
if ( item->GetId() != wxApp::s_macAboutMenuItemId )
{
- if ( mh == NULL )
+ // we have found a user help menu and an item other than the about item,
+ // so we can create the mac help menu now, if we haven't created it yet
+ if ( helpMenuHandle == NULL )
{
- MenuItemIndex firstUserHelpMenuItem ;
- if ( UMAGetHelpMenu( &mh , &firstUserHelpMenuItem) != noErr )
+ if ( UMAGetHelpMenu( &helpMenuHandle , &firstUserHelpMenuItem) != noErr )
{
- mh = NULL ;
+ helpMenuHandle = NULL ;
break ;
}
}
if ( item->IsSeparator() )
{
- if ( mh )
- MacAppendMenu(mh, "\p-" );
+ if ( helpMenuHandle )
+ AppendMenuItemTextWithCFString( helpMenuHandle,
+ CFSTR(""), kMenuItemAttrSeparator, 0,NULL);
}
else
{
- wxAcceleratorEntry* entry = wxGetAccelFromString( item->GetText() ) ;
+ wxAcceleratorEntry*
+ entry = wxAcceleratorEntry::Create( item->GetText() ) ;
if ( item->GetId() == wxApp::s_macAboutMenuItemId )
{
}
else
{
- if ( mh )
+ if ( helpMenuHandle )
{
- UMAAppendMenuItem(mh, wxStripMenuCodes(item->GetText()) , wxFont::GetDefaultEncoding(), entry);
- SetMenuItemCommandID( mh , CountMenuItems(mh) , wxIdToMacCommand ( item->GetId() ) ) ;
- SetMenuItemRefCon( mh , CountMenuItems(mh) , (UInt32)item ) ;
+ UMAAppendMenuItem(helpMenuHandle, wxStripMenuCodes(item->GetText()) , wxFont::GetDefaultEncoding(), entry);
+ SetMenuItemCommandID( helpMenuHandle , CountMenuItems(helpMenuHandle) , wxIdToMacCommand ( item->GetId() ) ) ;
+ SetMenuItemRefCon( helpMenuHandle , CountMenuItems(helpMenuHandle) , (URefCon) item ) ;
}
}
}
}
}
+
+ else if ( ( m_titles[i] == wxT("Window") || m_titles[i] == wxT("&Window") )
+ && GetAutoWindowMenu() )
+ {
+ if ( MacGetWindowMenuHMenu() == NULL )
+ {
+ CreateStandardWindowMenu( 0 , (MenuHandle*) &s_macWindowMenuHandle ) ;
+ }
+
+ MenuRef wm = (MenuRef)MacGetWindowMenuHMenu();
+ if ( wm == NULL )
+ break;
+
+ // get the insertion point in the standard menu
+ MenuItemIndex winListStart;
+ GetIndMenuItemWithCommandID(wm,
+ kHICommandWindowListSeparator, 1, NULL, &winListStart);
+
+ // add a separator so that the standard items and the custom items
+ // aren't mixed together, but only if this is the first run
+ OSStatus err = GetIndMenuItemWithCommandID(wm,
+ 'WXWM', 1, NULL, NULL);
+
+ if ( err == menuItemNotFoundErr )
+ {
+ InsertMenuItemTextWithCFString( wm,
+ CFSTR(""), winListStart-1, kMenuItemAttrSeparator, 'WXWM');
+ }
+
+ wxInsertMenuItemsInMenu(menu, wm, winListStart);
+ }
else
{
UMASetMenuTitle( MAC_WXHMENU(menu->GetHMenu()) , m_titles[i], m_font.GetEncoding() ) ;
menu->MacBeforeDisplay(false) ;
+
::InsertMenu(MAC_WXHMENU(_wxMenuAt(m_menus, i)->GetHMenu()), 0);
}
}
wxMenuItem *aboutMenuItem = FindItem(wxApp::s_macAboutMenuItemId , &aboutMenu) ;
if ( aboutMenuItem )
{
- wxAcceleratorEntry* entry = wxGetAccelFromString( aboutMenuItem->GetText() ) ;
+ wxAcceleratorEntry*
+ entry = wxAcceleratorEntry::Create( aboutMenuItem->GetText() ) ;
UMASetMenuItemText( GetMenuHandle( kwxMacAppleMenuId ) , 1 , wxStripMenuCodes ( aboutMenuItem->GetText() ) , wxFont::GetDefaultEncoding() );
UMAEnableMenuItem( GetMenuHandle( kwxMacAppleMenuId ) , 1 , true );
SetMenuItemCommandID( GetMenuHandle( kwxMacAppleMenuId ) , 1 , kHICommandAbout ) ;
- SetMenuItemRefCon(GetMenuHandle( kwxMacAppleMenuId ) , 1 , (UInt32)aboutMenuItem ) ;
+ SetMenuItemRefCon(GetMenuHandle( kwxMacAppleMenuId ) , 1 , (URefCon)aboutMenuItem ) ;
UMASetMenuItemShortcut( GetMenuHandle( kwxMacAppleMenuId ) , 1 , entry ) ;
}
}
projects / wxWidgets.git / blobdiff