#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"
// the (popup) menu title has this special id
static const int idMenuTitle = -2;
-static int formerHelpMenuItems = 0 ;
+static MenuItemIndex firstUserHelpMenuItem = 0 ;
const short kwxMacMenuBarResource = 1 ;
const short kwxMacAppleMenuId = 1 ;
// implementation
// ============================================================================
-//
-// Helper Functions to get Mac Menus the way they should be ;-)
-//
-
-void wxMacCtoPString(const char* theCString, Str255 thePString);
-
-// remove inappropriate characters, if useShortcuts is false, the ampersand will not auto-generate a mac menu-shortcut
-
-static void wxMacBuildMenuString(StringPtr outMacItemText, char *outMacShortcutChar , short *outMacModifiers , const char *inItemName , bool useShortcuts )
-{
- char *p = (char *) &outMacItemText[1] ;
- short macModifiers = 0 ;
- char macShortCut = 0 ;
-
- if ( useShortcuts && !wxApp::s_macSupportPCMenuShortcuts )
- useShortcuts = false ;
-
- // we have problems with a leading hypen - it will be taken as a separator
-
- while ( *inItemName == '-' )
- inItemName++ ;
-
- while( *inItemName )
- {
- switch ( *inItemName )
- {
- // special characters for macintosh menus -> use some replacement
- case ';' :
- *p++ = ',' ;
- break ;
- case '^' :
- *p++ = ' ' ;
- break ;
- case '!' :
- *p++ = ' ' ;
- break ;
- case '<' :
- *p++ = ' ' ;
- break ;
- case '/' :
- *p++ = '|' ;
- break ;
- case '(' :
- *p++ = '[' ;
- break ;
- case ')' :
- *p++ = ']' ;
- break ;
- // shortcuts
- case '&' :
- {
- ++inItemName ;
- if ( *inItemName )
- {
- *p++ = *inItemName ;
- if ( useShortcuts )
- macShortCut = *inItemName ;
- }
- else
- --inItemName ;
- }
- break ;
- // win-like accelerators
- case '\t' :
- {
- ++inItemName ;
- while( *inItemName )
- {
- if (strncmp("Ctrl+", inItemName, 5) == 0)
- {
- inItemName = inItemName + 5;
- macShortCut = *inItemName;
- }
- else if (strncmp("Alt+", inItemName, 4) == 0)
- {
- inItemName = inItemName + 4;
- macModifiers |= kMenuOptionModifier ;
- macShortCut = *inItemName ;
- }
- else if (strncmp("Shift+", inItemName, 6) == 0)
- {
- inItemName = inItemName + 6;
- macModifiers |= kMenuShiftModifier ;
- macShortCut = *inItemName ;
- }
- else if (strncmp("F", inItemName, 1) == 0)
- {
- inItemName += strlen( inItemName ) ;
- // no function keys at the moment
- // macModifiers |= kMenuShiftModifier ;
- // macShortCut = *inItemName ;
- }
- else
- {
- break ;
- }
- }
-
- if ( *inItemName == 0 )
- --inItemName ;
-
- }
- break ;
- default :
- *p++ = *inItemName ;
- }
- ++inItemName ;
- }
-
- outMacItemText[0] = (p - (char *)outMacItemText) - 1;
- if ( outMacShortcutChar )
- *outMacShortcutChar = macShortCut ;
- if ( outMacModifiers )
- *outMacModifiers = macModifiers ;
- if ( macShortCut )
- {
- int pos = outMacItemText[0] ;
- outMacItemText[++pos] = '/';
- outMacItemText[++pos] = toupper( macShortCut );
- outMacItemText[0] = pos ;
- }
-}
// Menus
// Construct a menu with optional title (then use append)
+#ifdef __DARWIN__
+short wxMenu::s_macNextMenuId = 3 ;
+#else
short wxMenu::s_macNextMenuId = 2 ;
+#endif
-wxMenu::wxMenu(const wxString& title, const wxFunction func)
+void wxMenu::Init()
{
- m_title = title;
- m_parent = NULL;
- m_eventHandler = this;
- m_noItems = 0;
- m_menuBar = NULL;
- m_pInvokingWindow = 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 )
+ {
+ wxLogLastError("CreatePopupMenu");
+ }
+
+ // if we have a title, insert it in the beginning of the menu
+ if ( !!m_title )
{
Append(idMenuTitle, m_title) ;
AppendSeparator() ;
}
+}
- Callback(func);
+wxMenu::~wxMenu()
+{
+ if (MAC_WXHMENU(m_hMenu))
+ ::DisposeMenu(MAC_WXHMENU(m_hMenu));
- Str255 label;
- wxMacBuildMenuString( label, NULL , NULL , title , false );
- m_macMenuId = s_macNextMenuId++;
- wxCHECK_RET( s_macNextMenuId < 236 , "menu ids > 235 cannot be used for submenus on mac" );
- m_macMenuHandle = ::NewMenu(m_macMenuId, label);
- m_macMenuEnabled = true ;
+#if wxUSE_ACCEL
+ // delete accels
+ WX_CLEAR_ARRAY(m_accels);
+#endif // wxUSE_ACCEL
}
-// The wxWindow destructor will take care of deleting the submenus.
-wxMenu::~wxMenu()
+void wxMenu::Break()
{
- wxNode *node = m_menuItems.First();
- while (node)
+ // not available on the mac platform
+}
+
+#if wxUSE_ACCEL
+
+int wxMenu::FindAccel(int id) const
+{
+ size_t n, count = m_accels.GetCount();
+ for ( n = 0; n < count; n++ )
{
- 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 ( m_accels[n]->m_command == id )
+ return n;
}
- if (m_macMenuHandle)
- ::DisposeMenu(m_macMenuHandle);
+
+ return wxNOT_FOUND;
}
-void wxMenu::Break()
+void wxMenu::UpdateAccel(wxMenuItem *item)
{
- // not available on the mac platform
+ // 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);
+ }
+
+ if ( IsAttached() )
+ {
+ m_menuBar->RebuildAccelTable();
+ }
}
+#endif // wxUSE_ACCEL
+
// function appends a new item or submenu to the menu
-void wxMenu::Append(wxMenuItem *pItem)
+// append a new item or submenu to the menu
+bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos)
{
- wxCHECK_RET( pItem != NULL, "can't append NULL item to the menu" );
-
- m_menuItems.Append(pItem);
+ wxASSERT_MSG( pItem != NULL, "can't append NULL item to the menu" );
+#if wxUSE_ACCEL
+ UpdateAccel(pItem);
+#endif // wxUSE_ACCEL
if ( pItem->IsSeparator() )
{
- MacAppendMenu(m_macMenuHandle, "\p-");
+ if ( pos == (size_t)-1 )
+ {
+ MacAppendMenu(MAC_WXHMENU(m_hMenu), "\p-");
+ }
+ else
+ {
+ MacInsertMenuItem(MAC_WXHMENU(m_hMenu), "\p-" , pos);
+ }
}
else
{
if ( pSubMenu != NULL )
{
Str255 label;
- wxCHECK_RET( pSubMenu->m_macMenuHandle != NULL , "invalid submenu added");
- pSubMenu->m_parent = this ;
- wxMacBuildMenuString( label , NULL , NULL , pItem->GetName() ,false);
-
- // hardcoded adding of the submenu combination for mac
+ wxASSERT_MSG( pSubMenu->m_hMenu != NULL , "invalid submenu added");
+ pSubMenu->m_menuParent = this ;
+ wxMenuItem::MacBuildMenuString( label , NULL , NULL , pItem->GetText() ,false);
- int theEnd = label[0] + 1;
- if (theEnd > 251)
- theEnd = 251; // mac allows only 255 characters
- label[theEnd++] = '/';
- label[theEnd++] = hMenuCmd;
- label[theEnd++] = '!';
- label[theEnd++] = pSubMenu->m_macMenuId;
- label[theEnd] = 0x00;
- label[0] = theEnd;
-
- if (wxMenuBar::s_macInstalledMenuBar == m_menuBar)
+ if (wxMenuBar::MacGetInstalledMenuBar() == m_menuBar)
{
- ::InsertMenu( pSubMenu->m_macMenuHandle , -1 ) ;
+ ::InsertMenu( MAC_WXHMENU( pSubMenu->m_hMenu ) , -1 ) ;
}
- ::AppendMenu(m_macMenuHandle, label);
+ 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 ;
- wxMacBuildMenuString( label , NULL , NULL , pItem->GetName(), pItem->GetId() == wxApp::s_macAboutMenuItemId);
+ 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] = ' ' ;
}
- ::AppendMenu(m_macMenuHandle, label );
+ 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 )
{
- UMADisableMenuItem( m_macMenuHandle , CountMItems( m_macMenuHandle ) ) ;
+ if ( pos == (size_t)-1 )
+ {
+ UMADisableMenuItem(MAC_WXHMENU(m_hMenu) , CountMenuItems(MAC_WXHMENU(m_hMenu) ) ) ;
+ }
+ else
+ {
+ UMADisableMenuItem(MAC_WXHMENU(m_hMenu) , pos + 1 ) ;
+ }
}
}
}
-
- m_noItems++;
-}
-
-void wxMenu::AppendSeparator()
-{
- Append(new wxMenuItem(this, ID_SEPARATOR));
-}
-
-// Pullright item
-void wxMenu::Append(int Id, const wxString& label, wxMenu *SubMenu,
- const wxString& helpString)
-{
- Append(new wxMenuItem(this, Id, label, helpString, FALSE, SubMenu));
-}
-
-// Ordinary menu item
-void wxMenu::Append(int Id, const wxString& label,
- const wxString& helpString, bool checkable)
-{
- // 'checkable' parameter is useless for Windows.
- Append(new wxMenuItem(this, Id, label, helpString, checkable));
-}
-
-void wxMenu::Delete(int id)
-{
- wxNode *node;
- wxMenuItem *item;
- int pos;
-
- for (pos = 0, node = m_menuItems.First(); node; node = node->Next(), pos++) {
- item = (wxMenuItem *)node->Data();
- if (item->GetId() == id)
- break;
+ // if we're already attached to the menubar, we must update it
+ if ( IsAttached() )
+ {
+ m_menuBar->Refresh();
}
-
- if (!node)
- return;
-
- int index = pos + 1 ;
-
- if (index < 1)
- return;
-
- wxMenu *pSubMenu = item->GetSubMenu();
- if ( pSubMenu != NULL )
- {
- ::DeleteMenuItem( m_macMenuHandle , index);
- pSubMenu->m_parent = NULL;
- // TODO: Why isn't subMenu deleted here???
- // Will put this in for now. Assuming this is supposed
- // to delete the menu, not just remove it.
- item->DeleteSubMenu();
- }
- else
- {
- ::DeleteMenuItem( m_macMenuHandle , index);
- }
-
- m_menuItems.DeleteNode(node);
- // TODO shouldn't we do this ? \8e_m_noItems--;
- delete item;
+ return TRUE ;
}
-void wxMenu::Enable(int Id, bool Flag)
+bool wxMenu::DoAppend(wxMenuItem *item)
{
- wxMenuItem *item = FindItemForId(Id);
- wxCHECK_RET( item != NULL, "can't enable non-existing menu item" );
-
- item->Enable(Flag);
+ return wxMenuBase::DoAppend(item) && DoInsertOrAppend(item);
}
-bool wxMenu::Enabled(int Id) const
+bool wxMenu::DoInsert(size_t pos, wxMenuItem *item)
{
- wxMenuItem *item = FindItemForId(Id);
- wxCHECK( item != NULL, FALSE );
-
- return item->IsEnabled();
+ return wxMenuBase::DoInsert(pos, item) && DoInsertOrAppend(item, pos);
}
-void wxMenu::Check(int Id, bool Flag)
+wxMenuItem *wxMenu::DoRemove(wxMenuItem *item)
{
- wxMenuItem *item = FindItemForId(Id);
- wxCHECK_RET( item != NULL, "can't get status of non-existing menu item" );
-
- item->Check(Flag);
-}
-
-bool wxMenu::Checked(int Id) const
-{
- wxMenuItem *item = FindItemForId(Id);
- wxCHECK( item != NULL, FALSE );
+ // 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;
- return item->IsChecked();
-}
+ node = node->GetNext();
+ }
-void wxMenu::SetTitle(const wxString& label)
-{
- Str255 title ;
- m_title = label ;
- wxMacBuildMenuString( title, NULL , NULL , label , false );
- UMASetMenuTitle( m_macMenuHandle , title ) ;
- if (wxMenuBar::s_macInstalledMenuBar == m_menuBar) // are we currently installed ?
- {
- ::SetMenuBar( GetMenuBar() ) ;
- ::InvalMenuBar() ;
- }
- // TODO:for submenus -> their parent item text must be corrected
-}
+ // DoRemove() (unlike Remove) can only be called for existing item!
+ wxCHECK_MSG( node, NULL, wxT("bug in wxMenu::Remove logic") );
-const wxString wxMenu::GetTitle() const
-{
- return m_title;
-}
+#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::SetLabel(int id, const wxString& label)
-{
- Str255 maclabel ;
- int index ;
- wxMenuItem *item = FindItemForId(id) ;
- if (item==NULL)
- return;
+ m_accels.RemoveAt(n);
+ }
+ //else: this item doesn't have an accel, nothing to do
+#endif // wxUSE_ACCEL
- index = MacGetIndexFromItem( item ) ;
- if (index < 1)
- return;
+ ::DeleteMenuItem(MAC_WXHMENU(m_hMenu) , pos + 1);
- if (item->GetSubMenu()==NULL)
- {
- wxMacBuildMenuString( maclabel , NULL , NULL , label , false );
- ::SetMenuItemText( m_macMenuHandle , index , maclabel ) ;
- }
- else
+ if ( IsAttached() )
{
- wxMacBuildMenuString( maclabel , NULL , NULL , label , false );
- ::SetMenuItemText( m_macMenuHandle , index , maclabel ) ;
+ // otherwise, the chane won't be visible
+ m_menuBar->Refresh();
}
- item->SetName(label);
-}
-wxString wxMenu::GetLabel(int Id) const
-{
- wxMenuItem *pItem = FindItemForId(Id) ;
- return pItem->GetName() ;
+ // and from internal data structures
+ return wxMenuBase::DoRemove(item);
}
-// Finds the item id matching the given string, -1 if not found.
-int wxMenu::FindItem (const wxString& itemString) const
-{
- char buf1[200];
- char buf2[200];
- wxStripMenuCodes ((char *)(const char *)itemString, buf1);
+// ---------------------------------------------------------------------------
+// accelerator helpers
+// ---------------------------------------------------------------------------
- for (wxNode * node = m_menuItems.First (); node; node = node->Next ())
- {
- 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();
- }
- }
-
- return -1;
-}
+#if wxUSE_ACCEL
-wxMenuItem *wxMenu::FindItemForId(int itemId, wxMenu ** itemMenu) 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
{
- if (itemMenu)
- *itemMenu = NULL;
- for (wxNode * node = m_menuItems.First (); node; node = node->Next ())
+ size_t count = GetAccelCount();
+ for ( size_t n = 0; n < count; n++ )
{
- wxMenuItem *item = (wxMenuItem *) node->Data ();
-
- if (item->GetId() == itemId)
- {
- if (itemMenu)
- *itemMenu = (wxMenu *) this;
- return item;
- }
-
- if (item->GetSubMenu())
- {
- wxMenuItem *ans = item->GetSubMenu()->FindItemForId (itemId, itemMenu);
- if (ans)
- return ans;
- }
+ *accels++ = *m_accels[n];
}
- if (itemMenu)
- *itemMenu = NULL;
- return NULL;
+ return count;
}
-void wxMenu::SetHelpString(int itemId, const wxString& helpString)
-{
- wxMenuItem *item = FindItemForId (itemId);
- if (item)
- item->SetHelp(helpString);
-}
+#endif // wxUSE_ACCEL
-wxString wxMenu::GetHelpString (int itemId) const
+void wxMenu::SetTitle(const wxString& label)
{
- wxMenuItem *item = FindItemForId (itemId);
- wxString str("");
- return (item == NULL) ? str : item->GetHelp();
+ Str255 title ;
+ m_title = label ;
+ wxMenuItem::MacBuildMenuString( title, NULL , NULL , label , false );
+ UMASetMenuTitle(MAC_WXHMENU(m_hMenu) , title ) ;
}
-
-void wxMenu::ProcessCommand(wxCommandEvent & event)
+bool wxMenu::ProcessCommand(wxCommandEvent & event)
{
bool processed = FALSE;
+#if WXWIN_COMPATIBILITY
// Try a callback
if (m_callback)
{
- (void) (*(m_callback)) (*this, event);
- processed = TRUE;
+ (void)(*(m_callback))(*this, event);
+ processed = TRUE;
}
+#endif WXWIN_COMPATIBILITY
// Try the menu's event handler
if ( !processed && GetEventHandler())
{
- processed = GetEventHandler()->ProcessEvent(event);
+ processed = GetEventHandler()->ProcessEvent(event);
}
- // Try the window the menu was popped up from (and up
- // through the hierarchy)
- if ( !processed && GetInvokingWindow())
- processed = GetInvokingWindow()->GetEventHandler()->ProcessEvent(event);
+ // 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;
}
-bool wxWindow::PopupMenu(wxMenu *menu, int x, int y)
-{
- menu->SetInvokingWindow(this);
- ClientToScreen( &x , &y ) ;
- ::InsertMenu( menu->m_macMenuHandle , -1 ) ;
- long menuResult = ::PopUpMenuSelect(menu->m_macMenuHandle ,y,x, 0) ;
- menu->MacMenuSelect( this , TickCount() , HiWord(menuResult) , LoWord(menuResult) ) ;
- ::DeleteMenu( menu->m_macMenuId ) ;
- menu->SetInvokingWindow(NULL);
+// ---------------------------------------------------------------------------
+// other
+// ---------------------------------------------------------------------------
+
+wxWindow *wxMenu::GetWindow() const
+{
+ if ( m_invokingWindow != NULL )
+ return m_invokingWindow;
+ else if ( m_menuBar != NULL)
+ return (wxWindow *) m_menuBar->GetFrame();
- return TRUE;
+ return NULL;
}
// helper functions returning the mac menu position for a certain item, note that this is
int wxMenu::MacGetIndexFromId( int id )
{
- wxNode *node;
- wxMenuItem *item;
- int pos;
-
- for (pos = 0, node = m_menuItems.First(); node; node = node->Next(), pos++)
+ size_t pos;
+ wxMenuItemList::Node *node = GetMenuItems().GetFirst();
+ for ( pos = 0; node; pos++ )
{
- item = (wxMenuItem *)node->Data();
- if (item->GetId() == id)
- break;
- }
+ if ( node->GetData()->GetId() == id )
+ break;
+ node = node->GetNext();
+ }
+
if (!node)
return 0;
int wxMenu::MacGetIndexFromItem( wxMenuItem *pItem )
{
- wxNode *node;
- int pos;
-
- for (pos = 0, node = m_menuItems.First(); node; node = node->Next(), pos++)
+ size_t pos;
+ wxMenuItemList::Node *node = GetMenuItems().GetFirst();
+ for ( pos = 0; node; pos++ )
{
- if ((wxMenuItem *)node->Data() == pItem)
- break;
+ if ( node->GetData() == pItem )
+ break;
+
+ node = node->GetNext();
}
if (!node)
void wxMenu::MacEnableMenu( bool bDoEnable )
{
- m_macMenuEnabled = bDoEnable ;
if ( bDoEnable )
- UMAEnableMenuItem( m_macMenuHandle , 0 ) ;
+ UMAEnableMenuItem(MAC_WXHMENU(m_hMenu) , 0 ) ;
else
- UMADisableMenuItem( m_macMenuHandle , 0 ) ;
+ UMADisableMenuItem(MAC_WXHMENU(m_hMenu) , 0 ) ;
::DrawMenuBar() ;
}
bool wxMenu::MacMenuSelect( wxEvtHandler* handler, long when , int macMenuId, int macMenuItemNum )
{
- int pos;
- wxNode *node;
-
- if ( m_macMenuId == macMenuId )
- {
- node = m_menuItems.Nth(macMenuItemNum-1);
- if (node)
- {
- wxMenuItem *pItem = (wxMenuItem*)node->Data();
-
- wxCommandEvent event(wxEVT_COMMAND_MENU_SELECTED, pItem->GetId());
- event.m_timeStamp = when;
- event.SetEventObject(handler);
- event.SetInt( pItem->GetId() );
-
- {
- bool processed = false ;
-
- // Try a callback
- if (m_callback)
- {
- (void) (*(m_callback)) (*this, event);
- processed = TRUE;
- }
-
- // 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 ;
- }
- }
- else if ( macMenuId == kHMHelpMenuID )
- {
- int menuItem = formerHelpMenuItems ;
- for (pos = 0, node = m_menuItems.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 ;
- // Try a callback
- if (m_callback)
- {
- (void) (*(m_callback)) (*this, event);
- processed = TRUE;
- }
-
- // 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 ;
- }
- }
- }
- }
+ int pos;
+ wxNode *node;
- for (pos = 0, node = m_menuItems.First(); node; node = node->Next(), pos++)
- {
- wxMenuItem * pItem = (wxMenuItem *) node->Data() ;
+ if ( m_macMenuId == macMenuId )
+ {
+ node = GetMenuItems().Nth(macMenuItemNum-1);
+ if (node)
+ {
+ 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 ;
+ }
+ }
+ 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 )
- {
- if ( pSubMenu->MacMenuSelect( handler , when , macMenuId , macMenuItemNum ) )
- return true ;
- }
- }
-
- return false ;
+ wxMenu *pSubMenu = pItem->GetSubMenu() ;
+ if ( pSubMenu != NULL )
+ {
+ if ( pSubMenu->MacMenuSelect( handler , when , macMenuId , macMenuItemNum ) )
+ return true ;
+ }
+ }
+
+ return false ;
}
// Menu Bar
wxMenuBar* wxMenuBar::s_macInstalledMenuBar = NULL ;
-wxMenuBar::wxMenuBar()
+void wxMenuBar::Init()
{
m_eventHandler = this;
- m_menuCount = 0;
- m_menus = NULL;
- m_titles = NULL;
m_menuBarFrame = NULL;
}
-wxMenuBar::wxMenuBar(int n, wxMenu *menus[], const wxString titles[])
+wxMenuBar::wxMenuBar()
{
- 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;
+ Init();
+}
+
+wxMenuBar::wxMenuBar( long WXUNUSED(style) )
+{
+ Init();
+}
+
+
+wxMenuBar::wxMenuBar(int count, wxMenu *menus[], const wxString titles[])
+{
+ Init();
+
+ m_titles.Alloc(count);
+
+ for ( int i = 0; i < count; i++ )
+ {
+ m_menus.Append(menus[i]);
+ m_titles.Add(titles[i]);
+
+ menus[i]->Attach(this);
+ }
}
wxMenuBar::~wxMenuBar()
s_macInstalledMenuBar = NULL;
}
- int i;
- for (i = 0; i < m_menuCount; i++)
+}
+
+void wxMenuBar::Refresh()
+{
+ wxCHECK_RET( IsAttached(), wxT("can't refresh unatteched menubar") );
+
+ DrawMenuBar();
+}
+
+#if wxUSE_ACCEL
+
+void wxMenuBar::RebuildAccelTable()
+{
+ // 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;
+ 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;
+ }
}
+#endif // wxUSE_ACCEL
+#ifdef WXMAKINGDLL
+extern short gCurrentResource ;
+#endif
void wxMenuBar::MacInstallMenuBar()
{
+ 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
MenuHandle menu = ::GetMenuHandle( kwxMacAppleMenuId ) ;
- ::AppendResMenu(menu, 'DRVR');
+#if TARGET_API_MAC_OS8
+ if ( CountMenuItems( menu ) == 2 )
+ {
+ ::AppendResMenu(menu, 'DRVR');
+ }
+#endif
- for (int i = 0; i < m_menuCount; i++)
+ for (int i = 0; i < m_menus.GetCount(); i++)
{
Str255 label;
wxNode *node;
int pos ;
wxMenu* menu = m_menus[i] , *subMenu = NULL ;
-
- if( m_titles[i] == "?" || m_titles[i] == wxApp::s_macHelpMenuTitleName )
+ if( m_titles[i] == "?" || m_titles[i] == "&?" || m_titles[i] == wxApp::s_macHelpMenuTitleName )
{
MenuHandle mh = NULL ;
- if ( HMGetHelpMenuHandle( &mh ) != noErr )
- {
- continue ;
- }
- if ( formerHelpMenuItems == 0 )
- {
- if( mh )
- formerHelpMenuItems = CountMenuItems( mh ) ;
- }
+ if ( UMAGetHelpMenu( &mh , &firstUserHelpMenuItem) != noErr )
+ {
+ continue ;
+ }
+
+ for ( int i = CountMenuItems( mh ) ; i >= firstUserHelpMenuItem ; --i )
+ {
+ DeleteMenuItem( mh , i ) ;
+ }
- for (pos = 0 , node = menu->m_menuItems.First(); node; node = node->Next(), pos++)
- {
+ for (pos = 0 , node = menu->GetMenuItems().First(); node; node = node->Next(), pos++)
+ {
item = (wxMenuItem *)node->Data();
subMenu = item->GetSubMenu() ;
if (subMenu)
}
else
{
- Str255 label ;
- wxMacBuildMenuString( label , NULL , NULL , item->GetName(), item->GetId() != wxApp::s_macAboutMenuItemId); // no shortcut in about menu
- if ( label[0] == 0 )
+ if ( item->IsSeparator() )
{
- // we cannot add empty menus on mac
- label[0] = 1 ;
- label[1] = ' ' ;
+ if ( mh )
+ MacAppendMenu(mh, "\p-" );
}
- if ( item->GetId() == wxApp::s_macAboutMenuItemId )
- {
- ::SetMenuItemText( GetMenuHandle( kwxMacAppleMenuId ) , 1 , label );
- // ::EnableMenuItem( GetMenuHandle( kwxMacAppleMenuId ) , 1 );
- ::EnableItem( GetMenuHandle( kwxMacAppleMenuId ) , 1 );
- }
else
{
- if ( mh )
- ::AppendMenu(mh, label );
+ 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
{
- wxMacBuildMenuString( label, NULL , NULL , m_titles[i] , false );
- UMASetMenuTitle( menu->m_macMenuHandle , label ) ;
- for (pos = 0, node = menu->m_menuItems.First(); node; node = node->Next(), pos++)
- {
+ 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)
{
- ::InsertMenu( subMenu->m_macMenuHandle , -1 ) ;
+ submenus.Add(subMenu) ;
}
}
- ::InsertMenu(m_menus[i]->m_macMenuHandle, 0);
+ ::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(size_t pos, bool enable)
+{
+ 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 to enable/disable items
-void wxMenuBar::Enable(int id, bool flag)
+void wxMenuBar::SetLabelTop(size_t pos, const wxString& label)
{
- wxMenu *itemMenu = NULL;
- wxMenuItem *item = FindItemForId(id, &itemMenu) ;
- if (!item)
+ wxCHECK_RET( pos < GetMenuCount(), wxT("invalid menu index") );
+
+ m_titles[pos] = label;
+
+ if ( !IsAttached() )
+ {
return;
+ }
- item->Enable( flag ) ;
+ m_menus[pos]->SetTitle( label ) ;
+ if (wxMenuBar::s_macInstalledMenuBar == this) // are we currently installed ?
+ {
+ ::SetMenuBar( GetMenuBar() ) ;
+ ::InvalMenuBar() ;
+ }
}
-void wxMenuBar::EnableTop(int pos, bool flag)
+wxString wxMenuBar::GetLabelTop(size_t pos) const
{
- m_menus[pos]->MacEnableMenu( flag ) ;
+ wxCHECK_MSG( pos < GetMenuCount(), wxEmptyString,
+ wxT("invalid menu index in wxMenuBar::GetLabelTop") );
+
+ return m_titles[pos];
}
-// Must only be used AFTER menu has been attached to frame,
-// otherwise use individual menus
-void wxMenuBar::Check(int id, bool flag)
+int wxMenuBar::FindMenu(const wxString& title)
{
- wxMenu *itemMenu = NULL;
- wxMenuItem *item = FindItemForId(id, &itemMenu) ;
- if (!item)
- return;
+ 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;
+ }
- if (!item->IsCheckable())
- return ;
+ return wxNOT_FOUND;
- item->Check( flag ) ;
}
-bool wxMenuBar::Checked(int id) const
-{
- wxMenu *itemMenu = NULL;
- wxMenuItem *item = FindItemForId(id, &itemMenu) ;
- if (!item)
- return FALSE;
- if (!item->IsCheckable())
- return FALSE ;
+// ---------------------------------------------------------------------------
+// wxMenuBar construction
+// ---------------------------------------------------------------------------
- return item->IsChecked() ;
-}
+// ---------------------------------------------------------------------------
+// wxMenuBar construction
+// ---------------------------------------------------------------------------
-bool wxMenuBar::Enabled(int id) const
+wxMenu *wxMenuBar::Replace(size_t pos, wxMenu *menu, const wxString& title)
{
- wxMenu *itemMenu = NULL;
- wxMenuItem *item = FindItemForId(id, &itemMenu) ;
- if (!item)
+ wxMenu *menuOld = wxMenuBarBase::Replace(pos, menu, title);
+ if ( !menuOld )
return FALSE;
+ m_titles[pos] = title;
- if ( !item->IsEnabled() )
- return FALSE ;
-
- if ( itemMenu->m_macMenuEnabled == false )
- return FALSE ;
-
- while( itemMenu->m_parent )
- {
- itemMenu = (wxMenu*) itemMenu->m_parent ;
- if ( itemMenu->IsKindOf( CLASSINFO( wxMenu ) ) )
+ if ( IsAttached() )
+ {
+ if (s_macInstalledMenuBar == this)
{
- if ( itemMenu->m_macMenuEnabled == false )
- return FALSE ;
+ ::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() ) ;
+ }
+ }
}
- }
-
- return TRUE ;
-}
-void wxMenuBar::SetLabel(int id, const wxString& label)
-{
- wxMenu *itemMenu = NULL;
- wxMenuItem *item = FindItemForId(id, &itemMenu) ;
+#if wxUSE_ACCEL
+ if ( menuOld->HasAccels() || menu->HasAccels() )
+ {
+ // need to rebuild accell table
+ RebuildAccelTable();
+ }
+#endif // wxUSE_ACCEL
- if (!item)
- return;
+ Refresh();
+ }
- itemMenu->SetLabel( id , label ) ;
+ 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);
- return itemMenu->GetLabel( id ) ;
-}
+ Str255 label ;
+ wxMenuItem::MacBuildMenuString( label, NULL , NULL , title , false );
+ UMASetMenuTitle( MAC_WXHMENU(menu->GetHMenu()) , label ) ;
-void wxMenuBar::SetLabelTop(int pos, const wxString& label)
-{
- m_menus[pos]->SetTitle( label ) ;
-}
+ 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() ) ;
+ }
-wxString wxMenuBar::GetLabelTop(int pos) const
-{
- return m_menus[pos]->GetTitle() ;
+#if wxUSE_ACCEL
+ if ( menu->HasAccels() )
+ {
+ // need to rebuild accell table
+ RebuildAccelTable();
+ }
+#endif // wxUSE_ACCEL
+
+ Refresh();
+ }
+
+ return TRUE;
}
-bool wxMenuBar::OnDelete(wxMenu *a_menu, int pos)
+void wxMenuBar::MacMenuSelect(wxEvtHandler* handler, long when , int macMenuId, int macMenuItemNum)
{
- if (s_macInstalledMenuBar == this)
- {
- ::DeleteMenu( a_menu->m_macMenuId /* m_menus[pos]->m_macMenuId */ ) ;
- ::InvalMenuBar() ;
- return TRUE ;
- }
- else
- {
- return TRUE ;
+ // 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 ;
+ }
+ }
}
}
-bool wxMenuBar::OnAppend(wxMenu *a_menu, const char *title)
+wxMenu *wxMenuBar::Remove(size_t pos)
{
- if (!a_menu->m_macMenuHandle)
- return FALSE;
+ wxMenu *menu = wxMenuBarBase::Remove(pos);
+ if ( !menu )
+ return NULL;
- if (s_macInstalledMenuBar == this)
- {
- Str255 label;
- wxMacBuildMenuString( label, NULL , NULL , title , false );
- UMASetMenuTitle( a_menu->m_macMenuHandle , label ) ;
- ::InsertMenu( a_menu->m_macMenuHandle , 0 ) ;
- ::InvalMenuBar() ;
- return TRUE ;
- }
- else
- {
- return TRUE ;
- }
-}
+ if ( IsAttached() )
+ {
+ if (s_macInstalledMenuBar == this)
+ {
+ ::DeleteMenu( menu->MacGetMenuId() /* m_menus[pos]->MacGetMenuId() */ ) ;
+ }
-void wxMenuBar::Append (wxMenu * menu, const wxString& title)
-{
- if (!OnAppend(menu, title))
- return;
+ menu->Detach();
- m_menuCount ++;
- wxMenu **new_menus = new wxMenu *[m_menuCount];
- wxString *new_titles = new wxString[m_menuCount];
- int i;
+#if wxUSE_ACCEL
+ if ( menu->HasAccels() )
+ {
+ // need to rebuild accell table
+ RebuildAccelTable();
+ }
+#endif // wxUSE_ACCEL
- 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] = "";
+ Refresh();
}
- if (m_menus)
- {
- delete[]m_menus;
- delete[]m_titles;
- }
- 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);
- ((wxMenu *)menu)->m_menuBar = (wxMenuBar *) this;
- ((wxMenu *)menu)->SetParent(this);
+ 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("");
-}
-void wxMenuBar::MacMenuSelect(wxEvtHandler* handler, long when , int macMenuId, int macMenuItemNum)
-{
- // 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_menuCount; i++)
- {
- if ( m_menus[i]->m_macMenuId == macMenuId ||
- ( macMenuId == kHMHelpMenuID && ( 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_menuCount; i++)
- {
- if ( m_menus[i]->MacMenuSelect( handler , when , macMenuId , macMenuItemNum ) )
- {
- break ;
- }
- }
- }
+ return item;
}
+
projects / wxWidgets.git / blobdiff