X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e9576ca53db96b462ed4c0b4bdf47d64c40203e4..c2edb18a7dc443fc0902945956a355ed722144fa:/src/mac/carbon/menu.cpp diff --git a/src/mac/carbon/menu.cpp b/src/mac/carbon/menu.cpp index 1fc7c4a229..1159391d37 100644 --- a/src/mac/carbon/menu.cpp +++ b/src/mac/carbon/menu.cpp @@ -22,11 +22,15 @@ #pragma implementation "menuitem.h" #endif +#include "wx/app.h" #include "wx/menu.h" #include "wx/menuitem.h" +#include "wx/window.h" #include "wx/log.h" #include "wx/utils.h" +#include "wx/mac/uma.h" + // other standard headers // ---------------------- #include @@ -36,536 +40,995 @@ IMPLEMENT_DYNAMIC_CLASS(wxMenu, wxEvtHandler) IMPLEMENT_DYNAMIC_CLASS(wxMenuBar, wxEvtHandler) #endif +// the (popup) menu title has this special id +static const int idMenuTitle = -2; +static MenuItemIndex firstUserHelpMenuItem = 0 ; + +const short kwxMacMenuBarResource = 1 ; +const short kwxMacAppleMenuId = 1 ; + // ============================================================================ // implementation // ============================================================================ + // Menus // Construct a menu with optional title (then use append) -wxMenu::wxMenu(const wxString& title, const wxFunction func) + +#ifdef __DARWIN__ +short wxMenu::s_macNextMenuId = 3 ; +#else +short wxMenu::s_macNextMenuId = 2 ; +#endif + +void wxMenu::Init() { - m_title = title; - m_parent = NULL; - m_eventHandler = this; - m_noItems = 0; - m_menuBar = NULL; - m_clientData = (void*) NULL; - if (m_title != "") + m_doBreak = FALSE; + + // create the menu + Str255 label; + wxMenuItem::MacBuildMenuString( label, NULL , NULL , m_title , false ); + m_macMenuId = s_macNextMenuId++; + wxCHECK_RET( s_macNextMenuId < 236 , "menu ids > 235 cannot be used for submenus on mac" ); + m_hMenu = ::NewMenu(m_macMenuId, label); + + if ( !m_hMenu ) { - Append(-2, m_title) ; - AppendSeparator() ; + wxLogLastError("CreatePopupMenu"); } - Callback(func); - - // TODO create menu + // if we have a title, insert it in the beginning of the menu + if ( !!m_title ) + { + Append(idMenuTitle, m_title) ; + AppendSeparator() ; + } } -// The wxWindow destructor will take care of deleting the submenus. wxMenu::~wxMenu() { - // TODO destroy menu and children + if (MAC_WXHMENU(m_hMenu)) + ::DisposeMenu(MAC_WXHMENU(m_hMenu)); - wxNode *node = m_menuItems.First(); - while (node) - { - wxMenuItem *item = (wxMenuItem *)node->Data(); - - // Delete child menus. - // Beware: they must not be appended to children list!!! - // (because order of delete is significant) - if (item->GetSubMenu()) - item->DeleteSubMenu(); - - wxNode *next = node->Next(); - delete item; - delete node; - node = next; - } +#if wxUSE_ACCEL + // delete accels + WX_CLEAR_ARRAY(m_accels); +#endif // wxUSE_ACCEL } void wxMenu::Break() { - // TODO + // not available on the mac platform } -// function appends a new item or submenu to the menu -void wxMenu::Append(wxMenuItem *pItem) +#if wxUSE_ACCEL + +int wxMenu::FindAccel(int id) const { - // TODO + size_t n, count = m_accels.GetCount(); + for ( n = 0; n < count; n++ ) + { + if ( m_accels[n]->m_command == id ) + return n; + } - wxCHECK_RET( pItem != NULL, "can't append NULL item to the menu" ); + return wxNOT_FOUND; +} - m_menuItems.Append(pItem); +void wxMenu::UpdateAccel(wxMenuItem *item) +{ + // find the (new) accel for this item + wxAcceleratorEntry *accel = wxGetAccelFromString(item->GetText()); + if ( accel ) + accel->m_command = item->GetId(); + + // find the old one + int n = FindAccel(item->GetId()); + if ( n == wxNOT_FOUND ) + { + // no old, add new if any + if ( accel ) + m_accels.Add(accel); + else + return; // skipping RebuildAccelTable() below + } + else + { + // replace old with new or just remove the old one if no new + delete m_accels[n]; + if ( accel ) + m_accels[n] = accel; + else + m_accels.RemoveAt(n); + } - m_noItems++; + if ( IsAttached() ) + { + m_menuBar->RebuildAccelTable(); + } } -void wxMenu::AppendSeparator() +#endif // wxUSE_ACCEL + +// function appends a new item or submenu to the menu +// append a new item or submenu to the menu +bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos) { - // TODO - Append(new wxMenuItem(this, ID_SEPARATOR)); + wxASSERT_MSG( pItem != NULL, "can't append NULL item to the menu" ); +#if wxUSE_ACCEL + UpdateAccel(pItem); +#endif // wxUSE_ACCEL + + if ( pItem->IsSeparator() ) + { + if ( pos == (size_t)-1 ) + { + MacAppendMenu(MAC_WXHMENU(m_hMenu), "\p-"); + } + else + { + MacInsertMenuItem(MAC_WXHMENU(m_hMenu), "\p-" , pos); + } + } + else + { + wxMenu *pSubMenu = pItem->GetSubMenu() ; + if ( pSubMenu != NULL ) + { + Str255 label; + wxASSERT_MSG( pSubMenu->m_hMenu != NULL , "invalid submenu added"); + pSubMenu->m_menuParent = this ; + wxMenuItem::MacBuildMenuString( label , NULL , NULL , pItem->GetText() ,false); + + if (wxMenuBar::MacGetInstalledMenuBar() == m_menuBar) + { + ::InsertMenu( MAC_WXHMENU( pSubMenu->m_hMenu ) , -1 ) ; + } + + if ( pos == (size_t)-1 ) + { + UMAAppendSubMenuItem(MAC_WXHMENU(m_hMenu), label, pSubMenu->m_macMenuId); + } + else + { + UMAInsertSubMenuItem(MAC_WXHMENU(m_hMenu), label , pos, pSubMenu->m_macMenuId); + } + } + else + { + Str255 label ; + UInt8 modifiers ; + SInt16 key ; + wxMenuItem::MacBuildMenuString( label, &key , &modifiers , pItem->GetText(), pItem->GetId() == wxApp::s_macAboutMenuItemId); + if ( label[0] == 0 ) + { + // we cannot add empty menus on mac + label[0] = 1 ; + label[1] = ' ' ; + } + if ( pos == (size_t)-1 ) + { + UMAAppendMenuItem(MAC_WXHMENU(m_hMenu), label,key,modifiers); + } + else + { + UMAInsertMenuItem(MAC_WXHMENU(m_hMenu), label , pos,key,modifiers); + } + if ( pItem->GetId() == idMenuTitle ) + { + if ( pos == (size_t)-1 ) + { + UMADisableMenuItem(MAC_WXHMENU(m_hMenu) , CountMenuItems(MAC_WXHMENU(m_hMenu) ) ) ; + } + else + { + UMADisableMenuItem(MAC_WXHMENU(m_hMenu) , pos + 1 ) ; + } + } + } + } + // if we're already attached to the menubar, we must update it + if ( IsAttached() ) + { + m_menuBar->Refresh(); + } + return TRUE ; } -// Pullright item -void wxMenu::Append(int Id, const wxString& label, wxMenu *SubMenu, - const wxString& helpString) +bool wxMenu::DoAppend(wxMenuItem *item) { - Append(new wxMenuItem(this, Id, label, helpString, FALSE, SubMenu)); + return wxMenuBase::DoAppend(item) && DoInsertOrAppend(item); } -// Ordinary menu item -void wxMenu::Append(int Id, const wxString& label, - const wxString& helpString, bool checkable) +bool wxMenu::DoInsert(size_t pos, wxMenuItem *item) { - // 'checkable' parameter is useless for Windows. - Append(new wxMenuItem(this, Id, label, helpString, checkable)); + return wxMenuBase::DoInsert(pos, item) && DoInsertOrAppend(item, pos); } -void wxMenu::Delete(int id) +wxMenuItem *wxMenu::DoRemove(wxMenuItem *item) { - wxNode *node; - wxMenuItem *item; - int pos; + // we need to find the items position in the child list + size_t pos; + wxMenuItemList::Node *node = GetMenuItems().GetFirst(); + for ( pos = 0; node; pos++ ) + { + if ( node->GetData() == item ) + break; - for (pos = 0, node = m_menuItems.First(); node; node = node->Next(), pos++) { - item = (wxMenuItem *)node->Data(); - if (item->GetId() == id) - break; + node = node->GetNext(); } - if (!node) - return; - - m_menuItems.DeleteNode(node); - delete item; + // DoRemove() (unlike Remove) can only be called for existing item! + wxCHECK_MSG( node, NULL, wxT("bug in wxMenu::Remove logic") ); - // TODO -} +#if wxUSE_ACCEL + // remove the corresponding accel from the accel table + int n = FindAccel(item->GetId()); + if ( n != wxNOT_FOUND ) + { + delete m_accels[n]; -void wxMenu::Enable(int Id, bool Flag) -{ - wxMenuItem *item = FindItemForId(Id); - wxCHECK_RET( item != NULL, "can't enable non-existing menu item" ); + m_accels.RemoveAt(n); + } + //else: this item doesn't have an accel, nothing to do +#endif // wxUSE_ACCEL - item->Enable(Flag); -} + ::DeleteMenuItem(MAC_WXHMENU(m_hMenu) , pos + 1); -bool wxMenu::Enabled(int Id) const -{ - wxMenuItem *item = FindItemForId(Id); - wxCHECK( item != NULL, FALSE ); + if ( IsAttached() ) + { + // otherwise, the chane won't be visible + m_menuBar->Refresh(); + } - return item->IsEnabled(); + // and from internal data structures + return wxMenuBase::DoRemove(item); } -void wxMenu::Check(int Id, bool Flag) -{ - wxMenuItem *item = FindItemForId(Id); - wxCHECK_RET( item != NULL, "can't get status of non-existing menu item" ); +// --------------------------------------------------------------------------- +// accelerator helpers +// --------------------------------------------------------------------------- - item->Check(Flag); -} +#if wxUSE_ACCEL -bool wxMenu::Checked(int Id) const +// create the wxAcceleratorEntries for our accels and put them into provided +// array - return the number of accels we have +size_t wxMenu::CopyAccels(wxAcceleratorEntry *accels) const { - wxMenuItem *item = FindItemForId(Id); - wxCHECK( item != NULL, FALSE ); + size_t count = GetAccelCount(); + for ( size_t n = 0; n < count; n++ ) + { + *accels++ = *m_accels[n]; + } - return item->IsChecked(); + return count; } +#endif // wxUSE_ACCEL + void wxMenu::SetTitle(const wxString& label) { + Str255 title ; m_title = label ; - // TODO + wxMenuItem::MacBuildMenuString( title, NULL , NULL , label , false ); + UMASetMenuTitle(MAC_WXHMENU(m_hMenu) , title ) ; } - -const wxString wxMenu::GetTitle() const -{ - return m_title; -} - -void wxMenu::SetLabel(int id, const wxString& label) +bool wxMenu::ProcessCommand(wxCommandEvent & event) { - wxMenuItem *item = FindItemForId(id) ; - if (item==NULL) - return; + bool processed = FALSE; - if (item->GetSubMenu()==NULL) +#if WXWIN_COMPATIBILITY + // Try a callback + if (m_callback) { - // TODO + (void)(*(m_callback))(*this, event); + processed = TRUE; } - else +#endif WXWIN_COMPATIBILITY + + // Try the menu's event handler + if ( !processed && GetEventHandler()) { - // TODO + processed = GetEventHandler()->ProcessEvent(event); } - item->SetName(label); + + // Try the window the menu was popped up from (and up through the + // hierarchy) + wxWindow *win = GetInvokingWindow(); + if ( !processed && win ) + processed = win->GetEventHandler()->ProcessEvent(event); + + return processed; } -wxString wxMenu::GetLabel(int Id) const + +// --------------------------------------------------------------------------- +// other +// --------------------------------------------------------------------------- + +wxWindow *wxMenu::GetWindow() const { - // TODO - return wxString("") ; + if ( m_invokingWindow != NULL ) + return m_invokingWindow; + else if ( m_menuBar != NULL) + return (wxWindow *) m_menuBar->GetFrame(); + + return NULL; } -// Finds the item id matching the given string, -1 if not found. -int wxMenu::FindItem (const wxString& itemString) const +// helper functions returning the mac menu position for a certain item, note that this is +// mac-wise 1 - based, i.e. the first item has index 1 whereas on MSWin it has pos 0 + +int wxMenu::MacGetIndexFromId( int id ) { - char buf1[200]; - char buf2[200]; - wxStripMenuCodes ((char *)(const char *)itemString, buf1); + size_t pos; + wxMenuItemList::Node *node = GetMenuItems().GetFirst(); + for ( pos = 0; node; pos++ ) + { + if ( node->GetData()->GetId() == id ) + break; - for (wxNode * node = m_menuItems.First (); node; node = node->Next ()) + node = node->GetNext(); + } + + if (!node) + return 0; + + return pos + 1 ; +} + +int wxMenu::MacGetIndexFromItem( wxMenuItem *pItem ) +{ + size_t pos; + wxMenuItemList::Node *node = GetMenuItems().GetFirst(); + for ( pos = 0; node; pos++ ) { - wxMenuItem *item = (wxMenuItem *) node->Data (); - if (item->GetSubMenu()) - { - int ans = item->GetSubMenu()->FindItem(itemString); - if (ans > -1) - return ans; - } - if ( !item->IsSeparator() ) - { - wxStripMenuCodes((char *)item->GetName().c_str(), buf2); - if (strcmp(buf1, buf2) == 0) - return item->GetId(); - } + if ( node->GetData() == pItem ) + break; + + node = node->GetNext(); } - return -1; + if (!node) + return 0; + + return pos + 1 ; } -wxMenuItem *wxMenu::FindItemForId(int itemId, wxMenu ** itemMenu) const +void wxMenu::MacEnableMenu( bool bDoEnable ) { - if (itemMenu) - *itemMenu = NULL; - for (wxNode * node = m_menuItems.First (); node; node = node->Next ()) - { - wxMenuItem *item = (wxMenuItem *) node->Data (); + if ( bDoEnable ) + UMAEnableMenuItem(MAC_WXHMENU(m_hMenu) , 0 ) ; + else + UMADisableMenuItem(MAC_WXHMENU(m_hMenu) , 0 ) ; + + ::DrawMenuBar() ; +} + +bool wxMenu::MacMenuSelect( wxEvtHandler* handler, long when , int macMenuId, int macMenuItemNum ) +{ + int pos; + wxNode *node; - if (item->GetId() == itemId) + if ( m_macMenuId == macMenuId ) + { + node = GetMenuItems().Nth(macMenuItemNum-1); + if (node) { - if (itemMenu) - *itemMenu = (wxMenu *) this; - return item; + wxMenuItem *pItem = (wxMenuItem*)node->Data(); + + if (pItem->IsCheckable()) + pItem->Check(! pItem->IsChecked()); + + wxCommandEvent event(wxEVT_COMMAND_MENU_SELECTED, pItem->GetId()); + event.m_timeStamp = when; + event.SetEventObject(handler); + event.SetInt( pItem->GetId() ); + { + bool processed = false ; + +#if WXWIN_COMPATIBILITY + // Try a callback + if (m_callback) + { + (void) (*(m_callback)) (*this, event); + processed = TRUE; + } +#endif + // Try the menu's event handler + if ( !processed && handler) + { + processed = handler->ProcessEvent(event); + } + + // Try the window the menu was popped up from (and up + // through the hierarchy) + if ( !processed && GetInvokingWindow()) + processed = GetInvokingWindow()->GetEventHandler()->ProcessEvent(event); + } + return true ; } - - if (item->GetSubMenu()) + } + else if ( macMenuId == kHMHelpMenuID ) + { + int menuItem = firstUserHelpMenuItem-1 ; + for (pos = 0, node = GetMenuItems().First(); node; node = node->Next(), pos++) + { + wxMenuItem * pItem = (wxMenuItem *) node->Data() ; + + wxMenu *pSubMenu = pItem->GetSubMenu() ; + if ( pSubMenu != NULL ) + { + } + else + { + if ( pItem->GetId() != wxApp::s_macAboutMenuItemId ) + ++menuItem ; + + if ( menuItem == macMenuItemNum ) + { + wxCommandEvent event(wxEVT_COMMAND_MENU_SELECTED, pItem->GetId()); + event.m_timeStamp = when; + event.SetEventObject(handler); + event.SetInt( pItem->GetId() ); + { + bool processed = false ; +#if WXWIN_COMPATIBILITY + // Try a callback + if (m_callback) + { + (void) (*(m_callback)) (*this, event); + processed = TRUE; + } +#endif + // Try the menu's event handler + if ( !processed && handler) + { + processed = handler->ProcessEvent(event); + } + + // Try the window the menu was popped up from (and up + // through the hierarchy) + if ( !processed && GetInvokingWindow()) + processed = GetInvokingWindow()->GetEventHandler()->ProcessEvent(event); + } + return true ; + } + } + } + } + + for (pos = 0, node = GetMenuItems().First(); node; node = node->Next(), pos++) + { + wxMenuItem * pItem = (wxMenuItem *) node->Data() ; + + wxMenu *pSubMenu = pItem->GetSubMenu() ; + if ( pSubMenu != NULL ) { - wxMenuItem *ans = item->GetSubMenu()->FindItemForId (itemId, itemMenu); - if (ans) - return ans; + if ( pSubMenu->MacMenuSelect( handler , when , macMenuId , macMenuItemNum ) ) + return true ; } } + + return false ; +} - if (itemMenu) - *itemMenu = NULL; - return NULL; +// Menu Bar + +/* + +Mac Implementation note : + +The Mac has only one global menubar, so we attempt to install the currently +active menubar from a frame, we currently don't take into account mdi-frames +which would ask for menu-merging + +Secondly there is no mac api for changing a menubar that is not the current +menubar, so we have to wait for preparing the actual menubar until the +wxMenubar is to be used + +We can in subsequent versions use MacInstallMenuBar to provide some sort of +auto-merge for MDI in case this will be necessary + +*/ + +wxMenuBar* wxMenuBar::s_macInstalledMenuBar = NULL ; + +void wxMenuBar::Init() +{ + m_eventHandler = this; + m_menuBarFrame = NULL; } -void wxMenu::SetHelpString(int itemId, const wxString& helpString) +wxMenuBar::wxMenuBar() { - wxMenuItem *item = FindItemForId (itemId); - if (item) - item->SetHelp(helpString); + Init(); } -wxString wxMenu::GetHelpString (int itemId) const +wxMenuBar::wxMenuBar( long WXUNUSED(style) ) { - wxMenuItem *item = FindItemForId (itemId); - wxString str(""); - return (item == NULL) ? str : item->GetHelp(); + Init(); } -void wxMenu::ProcessCommand(wxCommandEvent & event) + +wxMenuBar::wxMenuBar(int count, wxMenu *menus[], const wxString titles[]) { - bool processed = FALSE; + Init(); - // Try a callback - if (m_callback) - { - (void) (*(m_callback)) (*this, event); - processed = TRUE; - } + m_titles.Alloc(count); - // Try the menu's event handler - if ( !processed && GetEventHandler()) + for ( int i = 0; i < count; i++ ) { - processed = GetEventHandler()->ProcessEvent(event); - } -/* TODO - // Try the window the menu was popped up from (and up - // through the hierarchy) - if ( !processed && GetInvokingWindow()) - processed = GetInvokingWindow()->ProcessEvent(event); -*/ -} + m_menus.Append(menus[i]); + m_titles.Add(titles[i]); -bool wxWindow::PopupMenu(wxMenu *menu, int x, int y) -{ - // TODO - return FALSE; + menus[i]->Attach(this); + } } -// Menu Bar -wxMenuBar::wxMenuBar() +wxMenuBar::~wxMenuBar() { - m_eventHandler = this; - m_menuCount = 0; - m_menus = NULL; - m_titles = NULL; - m_menuBarFrame = NULL; + if (s_macInstalledMenuBar == this) + { + ::ClearMenuBar(); + s_macInstalledMenuBar = NULL; + } - // TODO } -wxMenuBar::wxMenuBar(int n, wxMenu *menus[], const wxString titles[]) +void wxMenuBar::Refresh() { - m_eventHandler = this; - m_menuCount = n; - m_menus = menus; - m_titles = new wxString[n]; - int i; - for ( i = 0; i < n; i++ ) - m_titles[i] = titles[i]; - m_menuBarFrame = NULL; + wxCHECK_RET( IsAttached(), wxT("can't refresh unatteched menubar") ); - // TODO + DrawMenuBar(); } -wxMenuBar::~wxMenuBar() +#if wxUSE_ACCEL + +void wxMenuBar::RebuildAccelTable() { - int i; - for (i = 0; i < m_menuCount; i++) + // merge the accelerators of all menus into one accel table + size_t nAccelCount = 0; + size_t i, count = GetMenuCount(); + for ( i = 0; i < count; i++ ) { - delete m_menus[i]; + nAccelCount += m_menus[i]->GetAccelCount(); } - delete[] m_menus; - delete[] m_titles; - // TODO + if ( nAccelCount ) + { + wxAcceleratorEntry *accelEntries = new wxAcceleratorEntry[nAccelCount]; + + nAccelCount = 0; + for ( i = 0; i < count; i++ ) + { + nAccelCount += m_menus[i]->CopyAccels(&accelEntries[nAccelCount]); + } + + m_accelTable = wxAcceleratorTable(nAccelCount, accelEntries); + + delete [] accelEntries; + } } -// Must only be used AFTER menu has been attached to frame, -// otherwise use individual menus to enable/disable items -void wxMenuBar::Enable(int id, bool flag) +#endif // wxUSE_ACCEL +#ifdef WXMAKINGDLL +extern short gCurrentResource ; +#endif +void wxMenuBar::MacInstallMenuBar() { - wxMenu *itemMenu = NULL; - wxMenuItem *item = FindItemForId(id, &itemMenu) ; - if (!item) - return; + if ( s_macInstalledMenuBar == this ) + return ; + + wxStAppResource resload ; + + Handle menubar = ::GetNewMBar( kwxMacMenuBarResource ) ; + wxString message ; + wxCHECK_RET( menubar != NULL, "can't read MBAR resource" ); + ::SetMenuBar( menubar ) ; +#if TARGET_API_MAC_CARBON + ::DisposeMenuBar( menubar ) ; +#else + ::DisposeHandle( menubar ) ; +#endif - // TODO + MenuHandle menu = ::GetMenuHandle( kwxMacAppleMenuId ) ; +#if TARGET_API_MAC_OS8 + if ( CountMenuItems( menu ) == 2 ) + { + ::AppendResMenu(menu, 'DRVR'); + } +#endif + + for (int i = 0; i < m_menus.GetCount(); i++) + { + Str255 label; + wxNode *node; + wxMenuItem *item; + int pos ; + wxMenu* menu = m_menus[i] , *subMenu = NULL ; + + if( m_titles[i] == "?" || m_titles[i] == "&?" || m_titles[i] == wxApp::s_macHelpMenuTitleName ) + { + MenuHandle mh = NULL ; + if ( UMAGetHelpMenu( &mh , &firstUserHelpMenuItem) != noErr ) + { + continue ; + } + + for ( int i = CountMenuItems( mh ) ; i >= firstUserHelpMenuItem ; --i ) + { + DeleteMenuItem( mh , i ) ; + } + + for (pos = 0 , node = menu->GetMenuItems().First(); node; node = node->Next(), pos++) + { + item = (wxMenuItem *)node->Data(); + subMenu = item->GetSubMenu() ; + if (subMenu) + { + // we don't support hierarchical menus in the help menu yet + } + else + { + if ( item->IsSeparator() ) + { + if ( mh ) + MacAppendMenu(mh, "\p-" ); + } + else + { + Str255 label ; + UInt8 modifiers ; + SInt16 key ; + wxMenuItem::MacBuildMenuString( label, &key , &modifiers , item->GetText(), item->GetId() != wxApp::s_macAboutMenuItemId); // no shortcut in about menu + if ( label[0] == 0 ) + { + // we cannot add empty menus on mac + label[0] = 1 ; + label[1] = ' ' ; + } + if ( item->GetId() == wxApp::s_macAboutMenuItemId ) + { + ::SetMenuItemText( GetMenuHandle( kwxMacAppleMenuId ) , 1 , label ); + UMAEnableMenuItem( GetMenuHandle( kwxMacAppleMenuId ) , 1 ); + } + else + { + if ( mh ) + UMAAppendMenuItem(mh, label , key , modifiers ); + } + } + } + } + } + else + { + wxMenuItem::MacBuildMenuString( label, NULL , NULL , m_titles[i] , false ); + UMASetMenuTitle( MAC_WXHMENU(menu->GetHMenu()) , label ) ; + wxArrayPtrVoid submenus ; + + for (pos = 0, node = menu->GetMenuItems().First(); node; node = node->Next(), pos++) + { + item = (wxMenuItem *)node->Data(); + subMenu = item->GetSubMenu() ; + if (subMenu) + { + submenus.Add(subMenu) ; + } + } + ::InsertMenu(MAC_WXHMENU(m_menus[i]->GetHMenu()), 0); + for ( int i = 0 ; i < submenus.GetCount() ; ++i ) + { + wxMenu* submenu = (wxMenu*) submenus[i] ; + wxNode *subnode; + wxMenuItem *subitem; + int subpos ; + for ( subpos = 0 , subnode = submenu->GetMenuItems().First(); subnode; subnode = subnode->Next(), subpos++) + { + subitem = (wxMenuItem *)subnode->Data(); + wxMenu* itsSubMenu = subitem->GetSubMenu() ; + if (itsSubMenu) + { + submenus.Add(itsSubMenu) ; + } + } + ::InsertMenu( MAC_WXHMENU(submenu->GetHMenu()) , -1 ) ; + } + } + } + ::DrawMenuBar() ; + s_macInstalledMenuBar = this; } -void wxMenuBar::EnableTop(int pos, bool flag) +void wxMenuBar::EnableTop(size_t pos, bool enable) { - // TODO + wxCHECK_RET( IsAttached(), wxT("doesn't work with unattached menubars") ); + m_menus[pos]->MacEnableMenu( enable ) ; + Refresh(); } -// Must only be used AFTER menu has been attached to frame, -// otherwise use individual menus -void wxMenuBar::Check(int id, bool flag) +void wxMenuBar::SetLabelTop(size_t pos, const wxString& label) { - wxMenu *itemMenu = NULL; - wxMenuItem *item = FindItemForId(id, &itemMenu) ; - if (!item) - return; + wxCHECK_RET( pos < GetMenuCount(), wxT("invalid menu index") ); - if (!item->IsCheckable()) - return ; + m_titles[pos] = label; - // TODO + if ( !IsAttached() ) + { + return; + } + + m_menus[pos]->SetTitle( label ) ; + if (wxMenuBar::s_macInstalledMenuBar == this) // are we currently installed ? + { + ::SetMenuBar( GetMenuBar() ) ; + ::InvalMenuBar() ; + } } -bool wxMenuBar::Checked(int id) const +wxString wxMenuBar::GetLabelTop(size_t pos) const { - wxMenu *itemMenu = NULL; - wxMenuItem *item = FindItemForId(id, &itemMenu) ; - if (!item) - return FALSE; + wxCHECK_MSG( pos < GetMenuCount(), wxEmptyString, + wxT("invalid menu index in wxMenuBar::GetLabelTop") ); - // TODO - return FALSE; + return m_titles[pos]; } -bool wxMenuBar::Enabled(int id) const +int wxMenuBar::FindMenu(const wxString& title) { - wxMenu *itemMenu = NULL; - wxMenuItem *item = FindItemForId(id, &itemMenu) ; - if (!item) - return FALSE; + wxString menuTitle = wxStripMenuCodes(title); + + size_t count = GetMenuCount(); + for ( size_t i = 0; i < count; i++ ) + { + wxString title = wxStripMenuCodes(m_titles[i]); + if ( menuTitle == title ) + return i; + } + + return wxNOT_FOUND; - // TODO - return FALSE ; } -void wxMenuBar::SetLabel(int id, const wxString& label) +// --------------------------------------------------------------------------- +// wxMenuBar construction +// --------------------------------------------------------------------------- + +// --------------------------------------------------------------------------- +// wxMenuBar construction +// --------------------------------------------------------------------------- + +wxMenu *wxMenuBar::Replace(size_t pos, wxMenu *menu, const wxString& title) { - wxMenu *itemMenu = NULL; - wxMenuItem *item = FindItemForId(id, &itemMenu) ; + wxMenu *menuOld = wxMenuBarBase::Replace(pos, menu, title); + if ( !menuOld ) + return FALSE; + m_titles[pos] = title; - if (!item) - return; + if ( IsAttached() ) + { + if (s_macInstalledMenuBar == this) + { + ::DeleteMenu( menuOld->MacGetMenuId() /* m_menus[pos]->MacGetMenuId() */ ) ; + { + Str255 label; + wxMenuItem::MacBuildMenuString( label, NULL , NULL , title , false ); + UMASetMenuTitle( MAC_WXHMENU(menu->GetHMenu()) , label ) ; + if ( pos == m_menus.GetCount() - 1) + { + ::InsertMenu( MAC_WXHMENU(menu->GetHMenu()) , 0 ) ; + } + else + { + ::InsertMenu( MAC_WXHMENU(menu->GetHMenu()) , m_menus[pos+1]->MacGetMenuId() ) ; + } + } + } + + +#if wxUSE_ACCEL + if ( menuOld->HasAccels() || menu->HasAccels() ) + { + // need to rebuild accell table + RebuildAccelTable(); + } +#endif // wxUSE_ACCEL - // TODO + Refresh(); + } + + return menuOld; } -wxString wxMenuBar::GetLabel(int id) const +bool wxMenuBar::Insert(size_t pos, wxMenu *menu, const wxString& title) { - wxMenu *itemMenu = NULL; - wxMenuItem *item = FindItemForId(id, &itemMenu) ; + if ( !wxMenuBarBase::Insert(pos, menu, title) ) + return FALSE; - if (!item) - return wxString(""); + m_titles.Insert(title, pos); - // TODO - return wxString("") ; -} + Str255 label ; + wxMenuItem::MacBuildMenuString( label, NULL , NULL , title , false ); + UMASetMenuTitle( MAC_WXHMENU(menu->GetHMenu()) , label ) ; -void wxMenuBar::SetLabelTop(int pos, const wxString& label) -{ - // TODO -} + if ( IsAttached() ) + { + if ( pos == (size_t) -1 || pos + 1 == m_menus.GetCount() ) + { + ::InsertMenu( MAC_WXHMENU(menu->GetHMenu()) , 0 ) ; + } + else + { + ::InsertMenu( MAC_WXHMENU(menu->GetHMenu()) , m_menus[pos+1]->MacGetMenuId() ) ; + } + +#if wxUSE_ACCEL + if ( menu->HasAccels() ) + { + // need to rebuild accell table + RebuildAccelTable(); + } +#endif // wxUSE_ACCEL -wxString wxMenuBar::GetLabelTop(int pos) const -{ - // TODO - return wxString(""); -} + Refresh(); + } -bool wxMenuBar::OnDelete(wxMenu *a_menu, int pos) -{ - // TODO - return FALSE; + return TRUE; } -bool wxMenuBar::OnAppend(wxMenu *a_menu, const char *title) +void wxMenuBar::MacMenuSelect(wxEvtHandler* handler, long when , int macMenuId, int macMenuItemNum) { - // TODO - return FALSE; + // first scan fast for direct commands, i.e. menus which have these commands directly in their own list + + if ( macMenuId == kwxMacAppleMenuId && macMenuItemNum == 1 ) + { + wxCommandEvent event(wxEVT_COMMAND_MENU_SELECTED, wxApp::s_macAboutMenuItemId ); + event.m_timeStamp = when; + event.SetEventObject(handler); + event.SetInt( wxApp::s_macAboutMenuItemId ); + handler->ProcessEvent(event); + } + else + { + for (int i = 0; i < m_menus.GetCount() ; i++) + { + if ( m_menus[i]->MacGetMenuId() == macMenuId || ( macMenuId == kHMHelpMenuID && ( m_titles[i] == "?" || m_titles[i] == "&?" || m_titles[i] == wxApp::s_macHelpMenuTitleName ) ) ) + { + if ( m_menus[i]->MacMenuSelect( handler , when , macMenuId , macMenuItemNum ) ) + return ; + else + { + //TODO flag this as an error since it must contain the item + return ; + } + } + } + + for (int i = 0; i < m_menus.GetCount(); i++) + { + if ( m_menus[i]->MacMenuSelect( handler , when , macMenuId , macMenuItemNum ) ) + { + break ; + } + } + } } -void wxMenuBar::Append (wxMenu * menu, const wxString& title) +wxMenu *wxMenuBar::Remove(size_t pos) { - if (!OnAppend(menu, title)) - return; - - m_menuCount ++; - wxMenu **new_menus = new wxMenu *[m_menuCount]; - wxString *new_titles = new wxString[m_menuCount]; - int i; + wxMenu *menu = wxMenuBarBase::Remove(pos); + if ( !menu ) + return NULL; - for (i = 0; i < m_menuCount - 1; i++) - { - new_menus[i] = m_menus[i]; - m_menus[i] = NULL; - new_titles[i] = m_titles[i]; - m_titles[i] = ""; - } - if (m_menus) + if ( IsAttached() ) { - delete[]m_menus; - delete[]m_titles; + if (s_macInstalledMenuBar == this) + { + ::DeleteMenu( menu->MacGetMenuId() /* m_menus[pos]->MacGetMenuId() */ ) ; + } + + menu->Detach(); + +#if wxUSE_ACCEL + if ( menu->HasAccels() ) + { + // need to rebuild accell table + RebuildAccelTable(); + } +#endif // wxUSE_ACCEL + + Refresh(); } - m_menus = new_menus; - m_titles = new_titles; - m_menus[m_menuCount - 1] = (wxMenu *)menu; - m_titles[m_menuCount - 1] = title; + m_titles.Remove(pos); - // TODO + return menu; } -void wxMenuBar::Delete(wxMenu * menu, int i) +bool wxMenuBar::Append(wxMenu *menu, const wxString& title) { - int j; - int ii = (int) i; - - if (menu != 0) - { - for (ii = 0; ii < m_menuCount; ii++) - { - if (m_menus[ii] == menu) - break; - } - if (ii >= m_menuCount) - return; - } else - { - if (ii < 0 || ii >= m_menuCount) - return; - menu = m_menus[ii]; - } + WXHMENU submenu = menu ? menu->GetHMenu() : 0; + wxCHECK_MSG( submenu, FALSE, wxT("can't append invalid menu to menubar") ); - if (!OnDelete(menu, ii)) - return; + if ( !wxMenuBarBase::Append(menu, title) ) + return FALSE; - menu->SetParent(NULL); + m_titles.Add(title); + + Str255 label ; + wxMenuItem::MacBuildMenuString( label, NULL , NULL , title , false ); + UMASetMenuTitle( MAC_WXHMENU(menu->GetHMenu()) , label ) ; - -- m_menuCount; - for (j = ii; j < m_menuCount; j++) + if ( IsAttached() ) { - m_menus[j] = m_menus[j + 1]; - m_titles[j] = m_titles[j + 1]; + if (s_macInstalledMenuBar == this) + { + ::InsertMenu( MAC_WXHMENU(menu->GetHMenu()) , 0 ) ; + } + +#if wxUSE_ACCEL + if ( menu->HasAccels() ) + { + // need to rebuild accell table + RebuildAccelTable(); + } +#endif // wxUSE_ACCEL + + Refresh(); } + + return TRUE; } -// Find the menu menuString, item itemString, and return the item id. -// Returns -1 if none found. -int wxMenuBar::FindMenuItem (const wxString& menuString, const wxString& itemString) const +void wxMenuBar::Detach() { - char buf1[200]; - char buf2[200]; - wxStripMenuCodes ((char *)(const char *)menuString, buf1); - int i; - for (i = 0; i < m_menuCount; i++) - { - wxStripMenuCodes ((char *)(const char *)m_titles[i], buf2); - if (strcmp (buf1, buf2) == 0) - return m_menus[i]->FindItem (itemString); - } - return -1; + wxMenuBarBase::Detach() ; } -wxMenuItem *wxMenuBar::FindItemForId (int Id, wxMenu ** itemMenu) const +void wxMenuBar::Attach(wxFrame *frame) { - if (itemMenu) - *itemMenu = NULL; + wxMenuBarBase::Attach( frame ) ; - wxMenuItem *item = NULL; - int i; - for (i = 0; i < m_menuCount; i++) - if ((item = m_menus[i]->FindItemForId (Id, itemMenu))) - return item; - return NULL; +#if wxUSE_ACCEL + RebuildAccelTable(); +#endif // wxUSE_ACCEL } +// --------------------------------------------------------------------------- +// wxMenuBar searching for menu items +// --------------------------------------------------------------------------- -void wxMenuBar::SetHelpString (int Id, const wxString& helpString) +// Find the itemString in menuString, and return the item id or wxNOT_FOUND +int wxMenuBar::FindMenuItem(const wxString& menuString, + const wxString& itemString) const { - int i; - for (i = 0; i < m_menuCount; i++) + wxString menuLabel = wxStripMenuCodes(menuString); + size_t count = GetMenuCount(); + for ( size_t i = 0; i < count; i++ ) { - if (m_menus[i]->FindItemForId (Id)) - { - m_menus[i]->SetHelpString (Id, helpString); - return; - } + wxString title = wxStripMenuCodes(m_titles[i]); + if ( menuString == title ) + return m_menus[i]->FindItem(itemString); } + + return wxNOT_FOUND; } -wxString wxMenuBar::GetHelpString (int Id) const +wxMenuItem *wxMenuBar::FindItem(int id, wxMenu **itemMenu) const { - int i; - for (i = 0; i < m_menuCount; i++) + if ( itemMenu ) + *itemMenu = NULL; + + wxMenuItem *item = NULL; + size_t count = GetMenuCount(); + for ( size_t i = 0; !item && (i < count); i++ ) { - if (m_menus[i]->FindItemForId (Id)) - return wxString(m_menus[i]->GetHelpString (Id)); + item = m_menus[i]->FindItem(id, itemMenu); } - return wxString(""); + + return item; }