X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cba2db0c2969f9b83e8a1736e260d22200e99a99..47f631042babbcf0f29722738aa9734eb01a5883:/src/msw/menu.cpp diff --git a/src/msw/menu.cpp b/src/msw/menu.cpp index 77923bb06a..8ff9016a50 100644 --- a/src/msw/menu.cpp +++ b/src/msw/menu.cpp @@ -6,28 +6,37 @@ // Created: 04/01/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart and Markus Holzem -// Licence: wxWindows license +// Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// +// =========================================================================== +// declarations +// =========================================================================== + +// --------------------------------------------------------------------------- +// headers +// --------------------------------------------------------------------------- + #ifdef __GNUG__ -#pragma implementation "menu.h" + #pragma implementation "menu.h" #endif // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif #ifndef WX_PRECOMP -#include "wx/frame.h" -#include "wx/menu.h" -#include "wx/utils.h" + #include "wx/frame.h" + #include "wx/menu.h" + #include "wx/utils.h" + #include "wx/intl.h" #endif #if wxUSE_OWNER_DRAWN - #include "wx/ownerdrw.h" + #include "wx/ownerdrw.h" #endif #include "wx/msw/private.h" @@ -36,9 +45,14 @@ #include "wx/log.h" // other standard headers -// ---------------------- #include +// ---------------------------------------------------------------------------- +// global variables +// ---------------------------------------------------------------------------- + +extern wxMenu *wxCurrentPopupMenu; + // ---------------------------------------------------------------------------- // constants // ---------------------------------------------------------------------------- @@ -47,384 +61,455 @@ static const int idMenuTitle = -2; // ---------------------------------------------------------------------------- -// wxWindows macros +// macros // ---------------------------------------------------------------------------- + #if !USE_SHARED_LIBRARY - IMPLEMENT_DYNAMIC_CLASS(wxMenu, wxEvtHandler) - IMPLEMENT_DYNAMIC_CLASS(wxMenuBar, wxEvtHandler) + IMPLEMENT_DYNAMIC_CLASS(wxMenu, wxEvtHandler) + IMPLEMENT_DYNAMIC_CLASS(wxMenuBar, wxEvtHandler) #endif // ============================================================================ // implementation // ============================================================================ -// Menus +// --------------------------------------------------------------------------- +// wxMenu construction, adding and removing menu items +// --------------------------------------------------------------------------- // Construct a menu with optional title (then use append) -wxMenu::wxMenu(const wxString& Title, const wxFunction func) +void wxMenu::Init(const wxString& title, const wxFunction func ) { - m_title = Title; - m_parent = NULL; - m_eventHandler = this; - m_pInvokingWindow = NULL; - m_doBreak = FALSE ; - m_noItems = 0; - m_menuBar = NULL; - m_hMenu = (WXHMENU) CreatePopupMenu(); - m_savehMenu = 0 ; - m_topLevelMenu = this; - m_clientData = (void*) NULL; - - if (m_title != "") - { - Append(idMenuTitle, m_title) ; - AppendSeparator() ; - } + m_title = title; + m_parent = NULL; + m_eventHandler = this; + m_pInvokingWindow = NULL; + m_doBreak = FALSE ; + m_noItems = 0; + m_menuBar = NULL; + m_hMenu = (WXHMENU) CreatePopupMenu(); + m_savehMenu = 0 ; + m_topLevelMenu = this; + m_clientData = (void*) NULL; + + if ( !!m_title ) + { + Append(idMenuTitle, m_title) ; + AppendSeparator() ; + } - Callback(func); + Callback(func); } // The wxWindow destructor will take care of deleting the submenus. wxMenu::~wxMenu() { - if (m_hMenu) - DestroyMenu((HMENU) m_hMenu); - m_hMenu = 0; - - // Windows seems really bad on Menu de-allocation... - // After many try, here is what I do: RemoveMenu() will ensure - // that popup are "disconnected" from their parent; then call - // delete method on each child (which in turn do a recursive job), - // and finally, DestroyMenu() - // - // With that, BoundCheckers is happy, and no complaints... -/* - int N = 0 ; - if (m_hMenu) - N = GetMenuItemCount(m_hMenu); - int i; - for (i = N-1; i >= 0; i--) - RemoveMenu(m_hMenu, i, MF_BYPOSITION); -*/ - - // How is deleting submenus in this loop any different from deleting - // the submenus in the children list, via ~wxWindow ? - // I'll reinstate this deletion for now and remove addition - // from children list (which doesn't exist now) - // Julian 1/3/97 - 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 (m_hMenu) - DestroyMenu(m_hMenu); - m_hMenu = 0; -*/ + // free Windows resources + if ( m_hMenu ) + { + ::DestroyMenu((HMENU)m_hMenu); + m_hMenu = 0; + } + + // delete submenus + 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->IsSubMenu() ) + item->DeleteSubMenu(); + + wxNode *next = node->Next(); + delete item; + delete node; + node = next; + } } void wxMenu::Break() { - m_doBreak = TRUE ; + m_doBreak = TRUE; } // function appends a new item or submenu to the menu void wxMenu::Append(wxMenuItem *pItem) { - wxCHECK_RET( pItem != NULL, "can't append NULL item to the menu" ); - - m_menuItems.Append(pItem); + wxCHECK_RET( pItem != NULL, _T("can't append NULL item to the menu") ); + +#if wxUSE_ACCEL + // check for accelerators: they are given after '\t' + wxString label = pItem->GetName(); + int posTab = label.Find(_T('\t')); + if ( posTab != wxNOT_FOUND ) { + // parse the accelerator string + int keyCode = 0; + int accelFlags = wxACCEL_NORMAL; + wxString current; + for ( size_t n = (size_t)posTab + 1; n < label.Len(); n++ ) { + if ( (label[n] == '+') || (label[n] == '-') ) { + if ( current == _("ctrl") ) + accelFlags |= wxACCEL_CTRL; + else if ( current == _("alt") ) + accelFlags |= wxACCEL_ALT; + else if ( current == _("shift") ) + accelFlags |= wxACCEL_SHIFT; + else { + wxLogDebug(_T("Unknown accel modifier: '%s'"), + current.c_str()); + } + + current.Empty(); + } + else { + current += wxTolower(label[n]); + } + } + + if ( current.IsEmpty() ) { + wxLogDebug(_T("No accel key found, accel string ignored.")); + } + else { + if ( current.Len() == 1 ) { + // it's a letter + keyCode = wxToupper(current[0U]); + } + else { + // it should be a function key + if ( current[0U] == 'f' && isdigit(current[1U]) && + (current.Len() == 2 || + (current.Len() == 3 && isdigit(current[2U]))) ) { + int n; + wxSscanf(current.c_str() + 1, _T("%d"), &n); + + keyCode = VK_F1 + n - 1; + } + else { + wxLogDebug(_T("Unrecognized accel key '%s', accel " + "string ignored."), current.c_str()); + } + } + } + + if ( keyCode ) { + // do add an entry + m_accelKeyCodes.Add(keyCode); + m_accelFlags.Add(accelFlags); + m_accelIds.Add(pItem->GetId()); + } + } +#endif // wxUSE_ACCEL - UINT flags = 0; - - if ( m_doBreak ) { - flags |= MF_MENUBREAK; - m_doBreak = FALSE; - } + UINT flags = 0; - if ( pItem->IsSeparator() ) { - flags |= MF_SEPARATOR; - } + // if "Break" has just been called, insert a menu break before this item + // (and don't forget to reset the flag) + if ( m_doBreak ) { + flags |= MF_MENUBREAK; + m_doBreak = FALSE; + } - // id is the numeric id for normal menu items and HMENU for submenus - UINT id; - wxMenu *SubMenu = pItem->GetSubMenu(); - if ( SubMenu != NULL ) { - wxASSERT( SubMenu->m_hMenu != (WXHMENU) NULL ); + if ( pItem->IsSeparator() ) { + flags |= MF_SEPARATOR; + } - id = (UINT)SubMenu->m_hMenu; + // id is the numeric id for normal menu items and HMENU for submenus as + // required by ::AppendMenu() API + UINT id; + wxMenu *submenu = pItem->GetSubMenu(); + if ( submenu != NULL ) { + wxASSERT( submenu->GetHMenu() != (WXHMENU) NULL ); - SubMenu->m_topLevelMenu = m_topLevelMenu; - SubMenu->m_parent = this; - SubMenu->m_savehMenu = (WXHMENU)id; - SubMenu->m_hMenu = 0; + id = (UINT)submenu->GetHMenu(); + submenu->m_topLevelMenu = m_topLevelMenu; + submenu->m_parent = this; + submenu->m_savehMenu = (WXHMENU)id; + submenu->m_hMenu = 0; - flags |= MF_POPUP; - } - else { - id = pItem->GetId(); - } + flags |= MF_POPUP; + } + else { + id = pItem->GetId(); + } - LPCSTR pData; + LPCTSTR pData; #if wxUSE_OWNER_DRAWN - if ( pItem->IsOwnerDrawn() ) { // want to get {Measure|Draw}Item messages? - // item draws itself, pass pointer to it in data parameter - flags |= MF_OWNERDRAW; - pData = (LPCSTR)pItem; - } - else + if ( pItem->IsOwnerDrawn() ) { // want to get {Measure|Draw}Item messages? + // item draws itself, pass pointer to it in data parameter + flags |= MF_OWNERDRAW; + pData = (LPCTSTR)pItem; + } + else #endif - { - // menu is just a normal string (passed in data parameter) - flags |= MF_STRING; - pData = pItem->GetName(); - } - - // visually select the menu title - if ( id == idMenuTitle ) - { - // TODO use SetMenuItemInfo(MFS_DEFAULT) to put it in bold face - } - - HMENU hMenu = (HMENU)((m_hMenu == 0) ? m_savehMenu : m_hMenu); - if ( !AppendMenu(hMenu, flags, id, pData) ) - { - wxLogLastError("AppendMenu"); - } + { + // menu is just a normal string (passed in data parameter) + flags |= MF_STRING; + pData = label; + } - m_noItems++; + if ( !::AppendMenu(GetHmenu(), flags, id, pData) ) + { + wxLogLastError("AppendMenu"); + } + else + { +#ifdef __WIN32__ + if ( id == idMenuTitle ) + { + // visually select the menu title + MENUITEMINFO mii; + mii.cbSize = sizeof(mii); + mii.fMask = MIIM_STATE; + mii.fState = MFS_DEFAULT; + + if ( !SetMenuItemInfo(GetHmenu(), (unsigned)id, FALSE, &mii) ) + { + wxLogLastError(_T("SetMenuItemInfo")); + } + } +#endif // __WIN32__ + + m_menuItems.Append(pItem); + m_noItems++; + } } void wxMenu::AppendSeparator() { - Append(new wxMenuItem(this, ID_SEPARATOR)); + Append(new wxMenuItem(this, ID_SEPARATOR)); } // Pullright item -void wxMenu::Append(int Id, const wxString& label, wxMenu *SubMenu, +void wxMenu::Append(int id, + const wxString& label, + wxMenu *SubMenu, const wxString& helpString) { - Append(new wxMenuItem(this, Id, label, helpString, FALSE, SubMenu)); + 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) +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)); + // 'checkable' parameter is useless for Windows. + Append(new wxMenuItem(this, id, label, helpString, checkable)); } +// delete item by id void wxMenu::Delete(int id) { - wxNode *node; - int pos; - HMENU menu; + wxMenuItem *item = NULL; + int pos; + wxNode *node; + for (pos = 0, node = m_menuItems.First(); node; node = node->Next(), pos++) + { + item = (wxMenuItem *)node->Data(); + if ( item->GetId() == id ) + break; + } - wxMenuItem *item = NULL; - for (pos = 0, node = m_menuItems.First(); node; node = node->Next(), pos++) { - item = (wxMenuItem *)node->Data(); - if (item->GetId() == id) - break; - } + wxCHECK_RET( node, _T("wxMenu::Delete(): item doesn't exist") ); + + HMENU menu = GetHmenu(); + + wxMenu *pSubMenu = item->GetSubMenu(); + if ( pSubMenu != NULL ) { + RemoveMenu(menu, (UINT)pos, MF_BYPOSITION); + pSubMenu->m_hMenu = pSubMenu->m_savehMenu; + pSubMenu->m_savehMenu = 0; + pSubMenu->m_parent = NULL; + // RemoveChild(item->subMenu); + pSubMenu->m_topLevelMenu = 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 { + DeleteMenu(menu, (UINT)pos, MF_BYPOSITION); + } + + m_menuItems.DeleteNode(node); + delete item; +} - if (!node) - return; +#if wxUSE_ACCEL - menu = (HMENU)(m_hMenu ? m_hMenu : m_savehMenu); +// --------------------------------------------------------------------------- +// accelerator helpers +// --------------------------------------------------------------------------- - wxMenu *pSubMenu = item->GetSubMenu(); - if ( pSubMenu != NULL ) { - RemoveMenu(menu, (UINT)pos, MF_BYPOSITION); - pSubMenu->m_hMenu = pSubMenu->m_savehMenu; - pSubMenu->m_savehMenu = 0; - pSubMenu->m_parent = NULL; - // RemoveChild(item->subMenu); - pSubMenu->m_topLevelMenu = 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 { - DeleteMenu(menu, (UINT)pos, MF_BYPOSITION); - } +// 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 +{ + size_t count = GetAccelCount(); + for ( size_t n = 0; n < count; n++ ) + { + (*accels++).Set(m_accelFlags[n], m_accelKeyCodes[n], m_accelIds[n]); + } - m_menuItems.DeleteNode(node); - delete item; + return count; } -void wxMenu::Enable(int Id, bool Flag) +#endif // wxUSE_ACCEL + +// --------------------------------------------------------------------------- +// wxMenu functions implemented in wxMenuItem +// --------------------------------------------------------------------------- + +void wxMenu::Enable(int id, bool Flag) { - wxMenuItem *item = FindItemForId(Id); - wxCHECK_RET( item != NULL, "can't enable non-existing menu item" ); + wxMenuItem *item = FindItemForId(id); + wxCHECK_RET( item != NULL, _T("can't enable non-existing menu item") ); - item->Enable(Flag); + item->Enable(Flag); } -bool wxMenu::Enabled(int Id) const +bool wxMenu::IsEnabled(int id) const { - wxMenuItem *item = FindItemForId(Id); - wxCHECK( item != NULL, FALSE ); + wxMenuItem *item = FindItemForId(id); + wxCHECK_MSG( item != NULL, FALSE, _T("invalid item id") ); - return item->IsEnabled(); + return item->IsEnabled(); } -void wxMenu::Check(int Id, bool Flag) +void wxMenu::Check(int id, bool Flag) { - wxMenuItem *item = FindItemForId(Id); - wxCHECK_RET( item != NULL, "can't get status of non-existing menu item" ); + wxMenuItem *item = FindItemForId(id); + wxCHECK_RET( item != NULL, _T("can't get status of non-existing menu item") ); - item->Check(Flag); + item->Check(Flag); } -bool wxMenu::Checked(int Id) const +bool wxMenu::IsChecked(int id) const { - wxMenuItem *item = FindItemForId(Id); - wxCHECK( item != NULL, FALSE ); + wxMenuItem *item = FindItemForId(id); + wxCHECK_MSG( item != NULL, FALSE, _T("invalid item id") ); - return item->IsChecked(); + return item->IsChecked(); } -void wxMenu::SetTitle(const wxString& label) +void wxMenu::SetLabel(int id, const wxString& label) { - bool hasNoTitle = m_title.IsEmpty(); - m_title = label; + wxMenuItem *item = FindItemForId(id) ; + wxCHECK_RET( item, _T("wxMenu::SetLabel: no such item") ); - HMENU hMenu = (HMENU)((m_hMenu == 0) ? m_savehMenu : m_hMenu); + item->SetName(label); +} - if ( hasNoTitle ) - { - if ( !label.IsEmpty() ) - { - if ( !InsertMenu(hMenu, 0u, MF_BYPOSITION | MF_STRING, - (unsigned)idMenuTitle, m_title) || - !InsertMenu(hMenu, 1u, MF_BYPOSITION, (unsigned)-1, NULL) ) - { - wxLogLastError("InsertMenu"); - } - } - } - else - { - if ( label.IsEmpty() ) - { - // remove the title and the separator after it - if ( !RemoveMenu(hMenu, 0, MF_BYPOSITION) || - !RemoveMenu(hMenu, 0, MF_BYPOSITION) ) - { - wxLogLastError("RemoveMenu"); - } - } +wxString wxMenu::GetLabel(int id) const +{ + wxString label; + wxMenuItem *pItem = FindItemForId(id) ; + if (pItem) + label = pItem->GetName() ; else - { - // modify the title - if ( !ModifyMenu(hMenu, 0u, - MF_BYPOSITION | MF_STRING, - (unsigned)idMenuTitle, m_title) ) - { - wxLogLastError("ModifyMenu"); - } - } - } + wxFAIL_MSG(_T("wxMenu::GetLabel: item doesn't exist")); -#ifndef __WIN16__ - // put the title string in bold face - if ( !m_title.IsEmpty() ) - { - MENUITEMINFO mii; - mii.cbSize = sizeof(mii); - mii.fMask = MIIM_STATE; - mii.fState = MFS_DEFAULT; + return label; +} - if ( !SetMenuItemInfo(hMenu, (unsigned)idMenuTitle, FALSE, &mii) ) - { - wxLogLastError("SetMenuItemInfo"); - } - } -#endif +void wxMenu::SetHelpString(int itemId, const wxString& helpString) +{ + wxMenuItem *item = FindItemForId (itemId); + if (item) + item->SetHelp(helpString); + else + wxFAIL_MSG(_T("wxMenu::SetHelpString: item doesn't exist")); } -const wxString wxMenu::GetTitle() const +wxString wxMenu::GetHelpString (int itemId) const { - return m_title; + wxString help; + wxMenuItem *item = FindItemForId (itemId); + if (item) + help = item->GetHelp(); + else + wxFAIL_MSG(_T("wxMenu::GetHelpString: item doesn't exist")); + + return help; } -void wxMenu::SetLabel(int Id, const wxString& label) +// --------------------------------------------------------------------------- +// wxMenu title +// --------------------------------------------------------------------------- + +void wxMenu::SetTitle(const wxString& label) { - wxMenuItem *item = FindItemForId(Id) ; - if (item==NULL) - return; + bool hasNoTitle = m_title.IsEmpty(); + m_title = label; + + HMENU hMenu = GetHmenu(); - if (item->GetSubMenu()==NULL) - { - if (m_hMenu) + if ( hasNoTitle ) { - UINT was_flag = GetMenuState((HMENU)m_hMenu,Id,MF_BYCOMMAND) ; - ModifyMenu((HMENU)m_hMenu,Id,MF_BYCOMMAND|MF_STRING|was_flag,Id,(const char *)label) ; + if ( !label.IsEmpty() ) + { + if ( !InsertMenu(hMenu, 0u, MF_BYPOSITION | MF_STRING, + (unsigned)idMenuTitle, m_title) || + !InsertMenu(hMenu, 1u, MF_BYPOSITION, (unsigned)-1, NULL) ) + { + wxLogLastError(_T("InsertMenu")); + } + } } - else if (m_savehMenu) + else { - UINT was_flag = GetMenuState((HMENU)m_savehMenu,Id,MF_BYCOMMAND) ; - ModifyMenu((HMENU)m_savehMenu,Id,MF_BYCOMMAND|MF_STRING|was_flag,Id,(const char *)label) ; + if ( label.IsEmpty() ) + { + // remove the title and the separator after it + if ( !RemoveMenu(hMenu, 0, MF_BYPOSITION) || + !RemoveMenu(hMenu, 0, MF_BYPOSITION) ) + { + wxLogLastError("RemoveMenu"); + } + } + else + { + // modify the title + if ( !ModifyMenu(hMenu, 0u, + MF_BYPOSITION | MF_STRING, + (unsigned)idMenuTitle, m_title) ) + { + wxLogLastError("ModifyMenu"); + } + } } - } - else - { - wxMenu *father = item->GetSubMenu()->m_topLevelMenu ; - wxNode *node = father->m_menuItems.First() ; - int i = 0 ; - while (node) + +#ifdef __WIN32__ + // put the title string in bold face + if ( !m_title.IsEmpty() ) { - wxMenuItem *matched = (wxMenuItem*)node->Data() ; - if (matched==item) - break ; - i++ ; - node = node->Next() ; + MENUITEMINFO mii; + mii.cbSize = sizeof(mii); + mii.fMask = MIIM_STATE; + mii.fState = MFS_DEFAULT; + + if ( !SetMenuItemInfo(hMenu, (unsigned)idMenuTitle, FALSE, &mii) ) + { + wxLogLastError("SetMenuItemInfo"); + } } - // Here, we have the position. - ModifyMenu((HMENU)father->m_savehMenu,i, - MF_BYPOSITION|MF_STRING|MF_POPUP, - (UINT)item->GetSubMenu()->m_savehMenu,(const char *)label) ; - } - item->SetName(label); +#endif } -wxString wxMenu::GetLabel(int id) const +const wxString wxMenu::GetTitle() const { -/* - static char tmp[128] ; - int len; - if (m_hMenu) - len = GetMenuString((HMENU)m_hMenu,Id,tmp,WXSIZEOF(tmp) - 1,MF_BYCOMMAND); - else if (m_savehMenu) - len = GetMenuString((HMENU)m_savehMenu,Id,tmp,WXSIZEOF(tmp) - 1,MF_BYCOMMAND); - else - len = 0 ; - tmp[len] = '\0' ; - return wxString(tmp) ; - -*/ - wxMenuItem *pItem = FindItemForId(id) ; - if (pItem) - return pItem->GetName() ; - else - return wxEmptyString; + return m_title; } +// --------------------------------------------------------------------------- +// event processing +// --------------------------------------------------------------------------- + bool wxMenu::MSWCommand(WXUINT WXUNUSED(param), WXWORD id) { // ignore commands from the menu title @@ -442,576 +527,673 @@ bool wxMenu::MSWCommand(WXUINT WXUNUSED(param), WXWORD id) return TRUE; } -// Finds the item id matching the given string, -1 if not found. -int wxMenu::FindItem (const wxString& itemString) const +bool wxMenu::ProcessCommand(wxCommandEvent & event) { - char buf1[200]; - char buf2[200]; - wxStripMenuCodes ((char *)(const char *)itemString, buf1); + bool processed = FALSE; - for (wxNode * node = m_menuItems.First (); node; node = node->Next ()) + // Try a callback + if (m_callback) { - 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(); - } + (void)(*(m_callback))(*this, event); + processed = TRUE; } - return -1; + // Try the menu's event handler + if ( !processed && GetEventHandler()) + { + processed = 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; } -wxMenuItem *wxMenu::FindItemForId(int itemId, wxMenu ** itemMenu) const -{ - if (itemMenu) - *itemMenu = NULL; - for (wxNode * node = m_menuItems.First (); node; node = node->Next ()) - { - wxMenuItem *item = (wxMenuItem *) node->Data (); +// --------------------------------------------------------------------------- +// Item search +// --------------------------------------------------------------------------- - if (item->GetId() == itemId) +// Finds the item id matching the given string, -1 if not found. +int wxMenu::FindItem (const wxString& itemString) const +{ + wxString itemLabel = wxStripMenuCodes(itemString); + for ( wxNode *node = m_menuItems.First(); node; node = node->Next() ) { - if (itemMenu) - *itemMenu = (wxMenu *) this; - return item; + wxMenuItem *item = (wxMenuItem *)node->Data(); + if ( item->IsSubMenu() ) + { + int ans = item->GetSubMenu()->FindItem(itemString); + if ( ans != wxNOT_FOUND ) + return ans; + } + else if ( !item->IsSeparator() ) + { + wxString label = wxStripMenuCodes(item->GetName()); + if ( itemLabel == label ) + return item->GetId(); + } } - if (item->GetSubMenu()) + return wxNOT_FOUND; +} + +wxMenuItem *wxMenu::FindItemForId(int itemId, wxMenu ** itemMenu) const +{ + if ( itemMenu ) + *itemMenu = NULL; + + wxMenuItem *item = NULL; + for ( wxNode *node = m_menuItems.First(); node && !item; node = node->Next() ) { - wxMenuItem *ans = item->GetSubMenu()->FindItemForId (itemId, itemMenu); - if (ans) - return ans; + item = (wxMenuItem *)node->Data(); + + if ( item->GetId() == itemId ) + { + if (itemMenu) + *itemMenu = (wxMenu *)this; + } + else if ( item->IsSubMenu() ) + { + item = item->GetSubMenu()->FindItemForId(itemId, itemMenu); + } + else + { + // don't exit the loop + item = NULL; + } } - } - if (itemMenu) - *itemMenu = NULL; - return NULL; + return item; } -void wxMenu::SetHelpString(int itemId, const wxString& helpString) +// --------------------------------------------------------------------------- +// other +// --------------------------------------------------------------------------- + +void wxMenu::Attach(wxMenuBar *menubar) { - wxMenuItem *item = FindItemForId (itemId); - if (item) - item->SetHelp(helpString); + // menu can be in at most one menubar because otherwise they would both + // delete the menu pointer + wxASSERT_MSG( !m_menuBar, _T("menu belongs to 2 menubars, expect a crash") ); + + m_menuBar = menubar; + m_savehMenu = m_hMenu; + m_hMenu = 0; } -wxString wxMenu::GetHelpString (int itemId) const +void wxMenu::Detach() { - wxMenuItem *item = FindItemForId (itemId); - if (item) - return item->GetHelp(); - else - return wxEmptyString; + wxASSERT_MSG( m_menuBar, _T("can't detach menu if it's not attached") ); + + m_hMenu = m_savehMenu; + m_savehMenu = 0; } -void wxMenu::ProcessCommand(wxCommandEvent & event) -{ - bool processed = FALSE; +// --------------------------------------------------------------------------- +// Menu Bar +// --------------------------------------------------------------------------- - // Try a callback - if (m_callback) - { - (void)(*(m_callback))(*this, event); - processed = TRUE; - } +void wxMenuBar::Init() +{ + m_eventHandler = this; + m_menuCount = 0; + m_menus = NULL; + m_titles = NULL; + m_menuBarFrame = NULL; + m_hMenu = 0; +} - // Try the menu's event handler - if ( !processed && GetEventHandler()) - { - processed = GetEventHandler()->ProcessEvent(event); - } +wxMenuBar::wxMenuBar() +{ + Init(); +} - // Try the window the menu was popped up from (and up - // through the hierarchy) - if ( !processed && GetInvokingWindow()) - processed = GetInvokingWindow()->GetEventHandler()->ProcessEvent(event); +wxMenuBar::wxMenuBar( long WXUNUSED(style) ) +{ + Init(); } -extern wxMenu *wxCurrentPopupMenu; -bool wxWindow::PopupMenu(wxMenu *menu, int x, int y) +wxMenuBar::wxMenuBar(int count, wxMenu *menus[], const wxString titles[]) { - menu->SetInvokingWindow(this); - menu->UpdateUI(); + Init(); - HWND hWnd = (HWND) GetHWND(); - HMENU hMenu = (HMENU)menu->m_hMenu; - POINT point; - point.x = x; - point.y = y; - ::ClientToScreen(hWnd, &point); - wxCurrentPopupMenu = menu; - ::TrackPopupMenu(hMenu, TPM_RIGHTBUTTON, point.x, point.y, 0, hWnd, NULL); - wxYield(); - wxCurrentPopupMenu = NULL; + m_menuCount = count; + m_menus = menus; + m_titles = new wxString[count]; - menu->SetInvokingWindow(NULL); + int i; + for ( i = 0; i < count; i++ ) + m_titles[i] = titles[i]; - return TRUE; + for ( i = 0; i < count; i++ ) + m_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; - m_hMenu = 0; -} + for ( int i = 0; i < m_menuCount; i++ ) + { + delete m_menus[i]; + } -wxMenuBar::wxMenuBar( long WXUNUSED(style) ) -{ - m_eventHandler = this; - m_menuCount = 0; - m_menus = NULL; - m_titles = NULL; - m_menuBarFrame = NULL; - m_hMenu = 0; + delete[] m_menus; + delete[] m_titles; } -wxMenuBar::wxMenuBar(int N, wxMenu *Menus[], const wxString Titles[]) +// --------------------------------------------------------------------------- +// wxMenuBar helpers +// --------------------------------------------------------------------------- + +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; - for (i = 0; i < N; i++) - m_menus[i]->m_menuBar = (wxMenuBar *) this; + wxCHECK_RET( m_menuBarFrame, _T("can't refresh a menubar withotu a frame") ); - m_hMenu = 0; + DrawMenuBar((HWND)m_menuBarFrame->GetHWND()) ; } -wxMenuBar::~wxMenuBar() +WXHMENU wxMenuBar::Create() { - // In fact, don't want menu to be destroyed before MDI - // shuffling has taken place. Let it be destroyed - // automatically when the window is destroyed. - -// DestroyMenu(menu); -// m_hMenu = NULL; - - int i; -/* - // See remarks in ::~wxMenu() method - // BEWARE - this may interfere with MDI fixes, so - // may need to remove - int N = 0 ; - - if (m_menuBarFrame && ((m_menuBarFrame->GetWindowStyleFlag() & wxSDI) == wxSDI)) - { - if (menu) - N = GetMenuItemCount(menu) ; - for (i = N-1; i >= 0; i--) - RemoveMenu(menu, i, MF_BYPOSITION); - } -*/ - for (i = 0; i < m_menuCount; i++) - { - delete m_menus[i]; - } - delete[] m_menus; - delete[] m_titles; - -/* Don't destroy menu here, in case we're MDI and - need to do some shuffling with VALID menu handles. - if (menu) - DestroyMenu(menu); - m_hMenu = 0; -*/ + if (m_hMenu != 0 ) + return m_hMenu; + + wxCHECK_MSG( !m_hMenu, TRUE, _T("menubar already created") ); + + m_hMenu = (WXHMENU)::CreateMenu(); + + if ( !m_hMenu ) + { + wxLogLastError("CreateMenu"); + } + else + { + for ( int i = 0; i < m_menuCount; i++ ) + { + if ( !::AppendMenu((HMENU)m_hMenu, MF_POPUP | MF_STRING, + (UINT)m_menus[i]->GetHMenu(), + m_titles[i]) ) + { + wxLogLastError("AppendMenu"); + } + } + } + + return m_hMenu; } +// --------------------------------------------------------------------------- +// wxMenuBar functions forwarded to wxMenuItem +// --------------------------------------------------------------------------- + // 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::Enable(int id, bool enable) { - int ms_flag; - if (Flag) - ms_flag = MF_ENABLED; - else - ms_flag = MF_GRAYED; + wxMenu *itemMenu = NULL; + wxMenuItem *item = FindItemForId(id, &itemMenu) ; - wxMenu *itemMenu = NULL; - wxMenuItem *item = FindItemForId(Id, &itemMenu) ; - if (!item) - return; - - if (itemMenu->m_hMenu) - EnableMenuItem((HMENU)itemMenu->m_hMenu, Id, MF_BYCOMMAND | ms_flag); - else if (itemMenu->m_savehMenu) - EnableMenuItem((HMENU)itemMenu->m_savehMenu, Id, MF_BYCOMMAND | ms_flag); + wxCHECK_RET( item, _T("attempt to enable an item which doesn't exist") ); + item->Enable(enable); } -void wxMenuBar::EnableTop(int pos, bool flag) +void wxMenuBar::EnableTop(int pos, bool enable) { - int ms_flag; - if (flag) - ms_flag = MF_ENABLED; - else - ms_flag = MF_GRAYED; + int flag = enable ? MF_ENABLED : MF_GRAYED;; - EnableMenuItem((HMENU)m_hMenu, pos, MF_BYPOSITION | ms_flag); - DrawMenuBar((HWND) m_menuBarFrame->GetHWND()) ; + EnableMenuItem((HMENU)m_hMenu, pos, MF_BYPOSITION | flag); } // Must only be used AFTER menu has been attached to frame, // otherwise use individual menus -void wxMenuBar::Check(int Id, bool Flag) -{ - wxMenu *itemMenu = NULL; - wxMenuItem *item = FindItemForId(Id, &itemMenu) ; - if (!item) - return; - - if (!item->IsCheckable()) - return ; - int ms_flag; - if (Flag) - ms_flag = MF_CHECKED; - else - ms_flag = MF_UNCHECKED; - - if (itemMenu->m_hMenu) - CheckMenuItem((HMENU)itemMenu->m_hMenu, Id, MF_BYCOMMAND | ms_flag); - else if (itemMenu->m_savehMenu) - CheckMenuItem((HMENU)itemMenu->m_savehMenu, Id, MF_BYCOMMAND | ms_flag); - -// CheckMenuItem((HMENU)m_hMenu, Id, MF_BYCOMMAND | ms_flag); -} - -bool wxMenuBar::Checked(int Id) const -{ - wxMenu *itemMenu = NULL; - wxMenuItem *item = FindItemForId(Id, &itemMenu) ; - if (!item) - return FALSE; +void wxMenuBar::Check(int id, bool check) +{ + wxMenu *itemMenu = NULL; + wxMenuItem *item = FindItemForId(id, &itemMenu) ; + + wxCHECK_RET( item, _T("attempt to check an item which doesn't exist") ); + wxCHECK_RET( item->IsCheckable(), _T("attempt to check an uncheckable item") ); + + item->Check(check); +} - int Flag = 0; +bool wxMenuBar::IsChecked(int id) const +{ + wxMenu *itemMenu = NULL; + wxMenuItem *item = FindItemForId(id, &itemMenu) ; - if (itemMenu->m_hMenu) - Flag=GetMenuState((HMENU)itemMenu->m_hMenu, Id, MF_BYCOMMAND) ; - else if (itemMenu->m_savehMenu) - Flag=GetMenuState((HMENU)itemMenu->m_savehMenu, Id, MF_BYCOMMAND) ; + wxCHECK_MSG( item, FALSE, _T("wxMenuBar::IsChecked(): no such item") ); -// Flag=GetMenuState((HMENU)m_hMenu, Id, MF_BYCOMMAND) ; + int flag = ::GetMenuState(GetHmenuOf(itemMenu), id, MF_BYCOMMAND); - if (Flag&MF_CHECKED) - return TRUE ; - else - return FALSE ; + return (flag & MF_CHECKED) != 0; } -bool wxMenuBar::Enabled(int Id) const +bool wxMenuBar::IsEnabled(int id) const { - wxMenu *itemMenu = NULL; - wxMenuItem *item = FindItemForId(Id, &itemMenu) ; - if (!item) - return FALSE; + wxMenu *itemMenu = NULL; + wxMenuItem *item = FindItemForId(id, &itemMenu) ; - int Flag ; + wxCHECK_MSG( item, FALSE, _T("wxMenuBar::IsEnabled(): no such item") ); - if (itemMenu->m_hMenu) - Flag=GetMenuState((HMENU)itemMenu->m_hMenu, Id, MF_BYCOMMAND) ; - else if (itemMenu->m_savehMenu) - Flag=GetMenuState((HMENU)itemMenu->m_savehMenu, Id, MF_BYCOMMAND) ; + int flag = ::GetMenuState(GetHmenuOf(itemMenu), id, MF_BYCOMMAND) ; - if (Flag&MF_ENABLED) - return TRUE ; - else - return FALSE ; + // don't "and" with MF_ENABLED because its value is 0 + return (flag & MF_DISABLED) == 0; } +void wxMenuBar::SetLabel(int id, const wxString& label) +{ + wxMenu *itemMenu = NULL; + wxMenuItem *item = FindItemForId(id, &itemMenu) ; + + wxCHECK_RET( item, _T("wxMenuBar::SetLabel(): no such item") ); -void wxMenuBar::SetLabel(int Id, const wxString& label) + item->SetName(label); +} + +wxString wxMenuBar::GetLabel(int id) const { - wxMenu *itemMenu = NULL; - wxMenuItem *item = FindItemForId(Id, &itemMenu) ; + wxMenu *itemMenu = NULL; + wxMenuItem *item = FindItemForId(id, &itemMenu) ; - if (!item) - return; + wxCHECK_MSG( item, _T(""), _T("wxMenuBar::GetLabel(): no such item") ); - if (itemMenu->m_hMenu) - { - UINT was_flag = GetMenuState((HMENU)itemMenu->m_hMenu,Id,MF_BYCOMMAND) ; - ModifyMenu((HMENU)itemMenu->m_hMenu,Id,MF_BYCOMMAND|MF_STRING|was_flag,Id,(const char *)label) ; - } - else if (itemMenu->m_savehMenu) - { - UINT was_flag = GetMenuState((HMENU)itemMenu->m_savehMenu,Id,MF_BYCOMMAND) ; - ModifyMenu((HMENU)itemMenu->m_savehMenu,Id,MF_BYCOMMAND|MF_STRING|was_flag,Id,(const char *)label) ; - } + return item->GetName(); } -wxString wxMenuBar::GetLabel(int Id) const +void wxMenuBar::SetHelpString (int id, const wxString& helpString) { - wxMenu *itemMenu = NULL; - wxMenuItem *item = FindItemForId(Id, &itemMenu) ; + wxMenu *itemMenu = NULL; + wxMenuItem *item = FindItemForId(id, &itemMenu) ; + + wxCHECK_RET( item, _T("wxMenuBar::SetHelpString(): no such item") ); + + item->SetHelp(helpString); +} - if (!item) - return wxString(""); +wxString wxMenuBar::GetHelpString (int id) const +{ + wxMenu *itemMenu = NULL; + wxMenuItem *item = FindItemForId(id, &itemMenu) ; - static char tmp[128] ; - int len = 0; - if (itemMenu->m_hMenu) - { - len = GetMenuString((HMENU)itemMenu->m_hMenu,Id,tmp,127,MF_BYCOMMAND) ; - } - else if (itemMenu->m_savehMenu) - { - len = GetMenuString((HMENU)itemMenu->m_savehMenu,Id,tmp,127,MF_BYCOMMAND) ; - } + wxCHECK_MSG( item, _T(""), _T("wxMenuBar::GetHelpString(): no such item") ); -// int len = GetMenuString((HMENU)m_hMenu,Id,tmp,127,MF_BYCOMMAND) ; - tmp[len] = '\0' ; - return wxString(tmp) ; + return item->GetHelp(); } +// --------------------------------------------------------------------------- +// wxMenuBar functions to work with the top level submenus +// --------------------------------------------------------------------------- + +// NB: we don't support owner drawn top level items for now, if we do these +// functions would have to be changed to use wxMenuItem as well + void wxMenuBar::SetLabelTop(int pos, const wxString& label) { - UINT was_flag = GetMenuState((HMENU)m_hMenu,pos,MF_BYPOSITION) ; - if (was_flag&MF_POPUP) - { - was_flag &= 0xff ; - HMENU popup = GetSubMenu((HMENU)m_hMenu,pos) ; - ModifyMenu((HMENU)m_hMenu,pos,MF_BYPOSITION|MF_STRING|was_flag,(UINT)popup,(const char *)label) ; - } - else - ModifyMenu((HMENU)m_hMenu,pos,MF_BYPOSITION|MF_STRING|was_flag,pos,(const char *)label) ; + UINT id; + UINT flagsOld = ::GetMenuState((HMENU)m_hMenu, pos, MF_BYPOSITION); + if ( flagsOld == 0xFFFFFFFF ) + { + wxLogLastError(_T("GetMenuState")); + + return; + } + + if ( flagsOld & MF_POPUP ) + { + // HIBYTE contains the number of items in the submenu in this case + flagsOld &= 0xff ; + id = (UINT)::GetSubMenu((HMENU)m_hMenu, pos) ; + } + else + { + id = pos; + } + + if ( ::ModifyMenu(GetHmenu(), pos, MF_BYPOSITION | MF_STRING | flagsOld, + id, label) == 0xFFFFFFFF ) + { + wxLogLastError("ModifyMenu"); + } } wxString wxMenuBar::GetLabelTop(int pos) const { - static char tmp[128] ; - int len = GetMenuString((HMENU)m_hMenu,pos,tmp,127,MF_BYPOSITION) ; - tmp[len] = '\0' ; - return wxString(tmp); + int len = ::GetMenuString((HMENU)m_hMenu, pos, NULL, 0, MF_BYCOMMAND); + + len++; // for the NUL character + wxString label; + ::GetMenuString(GetHmenu(), pos, label.GetWriteBuf(len), len, MF_BYCOMMAND); + label.UngetWriteBuf(); + + return label; } +// --------------------------------------------------------------------------- +// wxMenuBar notifications +// --------------------------------------------------------------------------- + bool wxMenuBar::OnDelete(wxMenu *a_menu, int pos) { - if (!m_menuBarFrame) - return TRUE; + if ( !m_menuBarFrame ) + return TRUE; - if (RemoveMenu((HMENU)m_hMenu, (UINT)pos, MF_BYPOSITION)) { - m_menus[pos]->m_hMenu = m_menus[pos]->m_savehMenu; - m_menus[pos]->m_savehMenu = 0; + if ( ::RemoveMenu((HMENU)m_hMenu, (UINT)pos, MF_BYPOSITION) ) + { + // VZ: I'm not sure about what's going on here, so I leave an assert + wxASSERT_MSG( m_menus[pos] == a_menu, _T("what is this parameter for??") ); - if (m_menuBarFrame) { - DrawMenuBar((HWND) m_menuBarFrame->GetHWND()) ; - } + a_menu->Detach(); - return TRUE; - } + if ( m_menuBarFrame ) + Refresh(); - return FALSE; + return TRUE; + } + else + { + wxLogLastError("RemoveMenu"); + } + + return FALSE; } -bool wxMenuBar::OnAppend(wxMenu *a_menu, const char *title) +bool wxMenuBar::OnAppend(wxMenu *a_menu, const wxChar *title) { - if (!a_menu->m_hMenu) - return FALSE; + WXHMENU submenu = a_menu->GetHMenu(); + if ( !submenu ) + return FALSE; - if (!m_menuBarFrame) - return TRUE; + if ( !m_menuBarFrame ) + return TRUE; - a_menu->m_savehMenu = a_menu->m_hMenu; - a_menu->m_hMenu = 0; + a_menu->Attach(this); - AppendMenu((HMENU)m_hMenu, MF_POPUP | MF_STRING, (UINT)a_menu->m_savehMenu, title); + if ( !::AppendMenu(GetHmenu(), MF_POPUP | MF_STRING, + (UINT)submenu, title) ) + { + wxLogLastError(_T("AppendMenu")); + } - DrawMenuBar((HWND) m_menuBarFrame->GetHWND()); + Refresh(); - return TRUE; + return TRUE; } -void wxMenuBar::Append (wxMenu * menu, const wxString& title) +// --------------------------------------------------------------------------- +// wxMenuBar construction +// --------------------------------------------------------------------------- +int wxMenuBar::FindMenu(const wxString& title) { - if (!OnAppend(menu, title)) - return; + wxString menuTitle = wxStripMenuCodes(title); + for ( int i = 0; i < m_menuCount; i++ ) + { + wxString title = wxStripMenuCodes(m_titles[i]); + if ( menuTitle == title ) + return i; + } + + return wxNOT_FOUND; + +} - m_menuCount ++; - wxMenu **new_menus = new wxMenu *[m_menuCount]; - wxString *new_titles = new wxString[m_menuCount]; - int i; - 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) - { - delete[]m_menus; - delete[]m_titles; - } - m_menus = new_menus; - m_titles = new_titles; +void wxMenuBar::ReplaceMenu(int pos, wxMenu * new_menu, const wxString& title) +{ + if (m_menuBarFrame) return; - m_menus[m_menuCount - 1] = (wxMenu *)menu; - m_titles[m_menuCount - 1] = title; + if ( pos >= 0 && pos < m_menuCount ) + { + wxMenu *old_menu = m_menus[pos]; + m_menus[pos] = new_menu; + delete old_menu; + } - ((wxMenu *)menu)->m_menuBar = (wxMenuBar *) this; - ((wxMenu *)menu)->SetParent(this); } -void wxMenuBar::Delete(wxMenu * menu, int i) + +void wxMenuBar::Insert(int pos, wxMenu * menu, const wxString& title) { - int j; - int ii = (int) i; + if (m_menuBarFrame) return; + if ( pos < 0 && pos >= m_menuCount ) return; + + m_menuCount ++; + wxMenu **new_menus = new wxMenu *[m_menuCount]; + wxString *new_titles = new wxString[m_menuCount]; + int i; + + for (i = 0; i < pos; i++) + { + new_menus[i] = m_menus[i]; + m_menus[i] = NULL; + new_titles[i] = m_titles[i]; + m_titles[i] = _T(""); + } - 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]; - } + new_menus[pos] = (wxMenu *)menu; + new_titles[i] = title; - if (!OnDelete(menu, ii)) - return; + for (i = pos+1; i < m_menuCount; i++) + { + new_menus[i] = m_menus[i-1]; + m_menus[i-1] = NULL; + new_titles[i] = m_titles[i-1]; + m_titles[i-1] = _T(""); + } + if (m_menus) + { + delete[]m_menus; + delete[]m_titles; + } + m_menus = new_menus; + m_titles = new_titles; - menu->SetParent(NULL); + menu->SetParent(this); - -- m_menuCount; - for (j = ii; j < m_menuCount; j++) { - m_menus[j] = m_menus[j + 1]; - m_titles[j] = m_titles[j + 1]; - } } -// 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::Append (wxMenu * menu, const wxString& title) { - char buf1[200]; - char buf2[200]; - wxStripMenuCodes ((char *)(const char *)menuString, buf1); - int i; - for (i = 0; i < m_menuCount; i++) + if (!OnAppend(menu, title)) + return; + + m_menuCount ++; + wxMenu **new_menus = new wxMenu *[m_menuCount]; + wxString *new_titles = new wxString[m_menuCount]; + int i; + + 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] = _T(""); + } + if (m_menus) { - wxStripMenuCodes ((char *)(const char *)m_titles[i], buf2); - if (strcmp (buf1, buf2) == 0) - return m_menus[i]->FindItem (itemString); + delete[]m_menus; + delete[]m_titles; } - return -1; + m_menus = new_menus; + m_titles = new_titles; + + m_menus[m_menuCount - 1] = (wxMenu *)menu; + m_titles[m_menuCount - 1] = title; + + menu->SetParent(this); } -wxMenuItem *wxMenuBar::FindItemForId (int Id, wxMenu ** itemMenu) const +void wxMenuBar::Delete(wxMenu * menu, int i) { - if (itemMenu) - *itemMenu = NULL; + 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]; + } - wxMenuItem *item = NULL; - int i; - for (i = 0; i < m_menuCount; i++) - { - item = m_menus[i]->FindItemForId (Id, itemMenu); - if (item) - return item; - } - return NULL; + if (!OnDelete(menu, ii)) + return; + + menu->SetParent(NULL); + + -- m_menuCount; + for (j = ii; j < m_menuCount; j++) { + m_menus[j] = m_menus[j + 1]; + m_titles[j] = m_titles[j + 1]; + } } -void wxMenuBar::SetHelpString (int Id, const wxString& helpString) +void wxMenuBar::Attach(wxFrame *frame) { - int i; - for (i = 0; i < m_menuCount; i++) + wxASSERT_MSG( !m_menuBarFrame, _T("menubar already attached!") ); + + m_menuBarFrame = frame; + +#if wxUSE_ACCEL + // create the accel table - we consider that the menubar construction is + // finished + size_t nAccelCount = 0; + int i; + for ( i = 0; i < m_menuCount; i++ ) + { + nAccelCount += m_menus[i]->GetAccelCount(); + } + + if ( nAccelCount ) { - if (m_menus[i]->FindItemForId (Id)) - { - m_menus[i]->SetHelpString (Id, helpString); - return; - } + wxAcceleratorEntry *accelEntries = new wxAcceleratorEntry[nAccelCount]; + + nAccelCount = 0; + for ( i = 0; i < m_menuCount; i++ ) + { + nAccelCount += m_menus[i]->CopyAccels(&accelEntries[nAccelCount]); + } + + m_accelTable = wxAcceleratorTable(nAccelCount, accelEntries); + + delete [] accelEntries; } +#endif // wxUSE_ACCEL +} + +void wxMenuBar::Detach() +{ +// ::DestroyMenu((HMENU)m_hMenu); + m_hMenu = NULL; + m_menuBarFrame = NULL; } -wxString wxMenuBar::GetHelpString (int Id) const + +// --------------------------------------------------------------------------- +// wxMenuBar searching for menu items +// --------------------------------------------------------------------------- + +// 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); + for ( int i = 0; i < m_menuCount; i++ ) { - if (m_menus[i]->FindItemForId (Id)) - return wxString(m_menus[i]->GetHelpString (Id)); + wxString title = wxStripMenuCodes(m_titles[i]); + if ( menuString == title ) + return m_menus[i]->FindItem(itemString); } - return wxString(""); + + return wxNOT_FOUND; } +wxMenuItem *wxMenuBar::FindItemForId (int id, wxMenu **itemMenu) const +{ + if ( itemMenu ) + *itemMenu = NULL; + + wxMenuItem *item = NULL; + for ( int i = 0; !item && (i < m_menuCount); i++ ) + { + item = m_menus[i]->FindItemForId(id, itemMenu); + } + + return item; +} + + +// ---------------------------------------------------------------------------- +// helper functions +// ---------------------------------------------------------------------------- + wxWindow *wxMenu::GetWindow() const -{ - if ( m_pInvokingWindow != NULL ) - return m_pInvokingWindow; - if ( m_menuBar != NULL) - return m_menuBar->m_menuBarFrame; - return NULL; +{ + if ( m_pInvokingWindow != NULL ) + return m_pInvokingWindow; + else if ( m_menuBar != NULL) + return m_menuBar->GetFrame(); + + return NULL; } WXHMENU wxMenu::GetHMenu() const { - if ( m_hMenu != 0 ) - return m_hMenu; - else if ( m_savehMenu != 0 ) - return m_savehMenu; + if ( m_hMenu != 0 ) + return m_hMenu; + else if ( m_savehMenu != 0 ) + return m_savehMenu; + + wxFAIL_MSG(_T("wxMenu without HMENU")); - return 0; + return 0; } -// Update a menu and all submenus recursively. -// source is the object that has the update event handlers -// defined for it. If NULL, the menu or associated window -// will be used. +// Update a menu and all submenus recursively. source is the object that has +// the update event handlers defined for it. If NULL, the menu or associated +// window will be used. void wxMenu::UpdateUI(wxEvtHandler* source) { - if (!source && GetInvokingWindow()) - source = GetInvokingWindow()->GetEventHandler(); - if (!source) - source = GetEventHandler(); - if (!source) - source = this; - - wxNode* node = GetItems().First(); - while (node) - { - wxMenuItem* item = (wxMenuItem*) node->Data(); - if ( !item->IsSeparator() ) - { - wxWindowID id = item->GetId(); - wxUpdateUIEvent event(id); - event.SetEventObject( source ); - - if (source->ProcessEvent(event)) - { - if (event.GetSetText()) - SetLabel(id, event.GetText()); - if (event.GetSetChecked()) - Check(id, event.GetChecked()); - if (event.GetSetEnabled()) - Enable(id, event.GetEnabled()); - } - - if (item->GetSubMenu()) - item->GetSubMenu()->UpdateUI(source); - } - node = node->Next(); - } + if (!source && GetInvokingWindow()) + source = GetInvokingWindow()->GetEventHandler(); + if (!source) + source = GetEventHandler(); + if (!source) + source = this; + + wxNode* node = GetItems().First(); + while (node) + { + wxMenuItem* item = (wxMenuItem*) node->Data(); + if ( !item->IsSeparator() ) + { + wxWindowID id = item->GetId(); + wxUpdateUIEvent event(id); + event.SetEventObject( source ); + + if (source->ProcessEvent(event)) + { + if (event.GetSetText()) + SetLabel(id, event.GetText()); + if (event.GetSetChecked()) + Check(id, event.GetChecked()); + if (event.GetSetEnabled()) + Enable(id, event.GetEnabled()); + } + + if (item->GetSubMenu()) + item->GetSubMenu()->UpdateUI(source); + } + node = node->Next(); + } }