X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/47d67540a017101b3e46abe9ef0f55914d8de37e..cb73e6001f891ae46b12a1e4ca39b93649cb6099:/src/msw/menu.cpp?ds=sidebyside diff --git a/src/msw/menu.cpp b/src/msw/menu.cpp index 8898ae5d9e..6f1343b30c 100644 --- a/src/msw/menu.cpp +++ b/src/msw/menu.cpp @@ -5,898 +5,1046 @@ // Modified by: Vadim Zeitlin // Created: 04/01/98 // RCS-ID: $Id$ -// Copyright: (c) Julian Smart and Markus Holzem -// Licence: wxWindows license +// Copyright: (c) Julian Smart +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// +// =========================================================================== +// declarations +// =========================================================================== -// ============================================================================ -// headers & declarations -// ============================================================================ +// --------------------------------------------------------------------------- +// headers +// --------------------------------------------------------------------------- -// wxWindows headers -// ----------------- - -#ifdef __GNUG__ -#pragma implementation "menu.h" -#pragma implementation "menuitem.h" +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) + #pragma implementation "menu.h" #endif // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif +#if wxUSE_MENUS + #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" + #include "wx/log.h" #endif #if wxUSE_OWNER_DRAWN -#include "wx/ownerdrw.h" + #include "wx/ownerdrw.h" #endif #include "wx/msw/private.h" -#include "wx/msw/menu.h" -#include "wx/menuitem.h" -#include "wx/log.h" -// other standard headers -// ---------------------- -#include +#ifdef __WXWINCE__ +#include +#include +#include +#include +#include +#include -#if !USE_SHARED_LIBRARY -IMPLEMENT_DYNAMIC_CLASS(wxMenu, wxEvtHandler) -IMPLEMENT_DYNAMIC_CLASS(wxMenuBar, wxEvtHandler) +#ifndef TBSTYLE_NO_DROPDOWN_ARROW +#define TBSTYLE_NO_DROPDOWN_ARROW 0x0080 #endif -// ============================================================================ -// implementation -// ============================================================================ +#endif -// Menus +// other standard headers +#include -// Construct a menu with optional title (then use append) -wxMenu::wxMenu(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; - if (m_title != "") - { - Append(-2, m_title) ; - AppendSeparator() ; - } - - Callback(func); -} +// ---------------------------------------------------------------------------- +// global variables +// ---------------------------------------------------------------------------- -// The wxWindow destructor will take care of deleting the submenus. -wxMenu::~wxMenu(void) -{ - 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); -*/ +extern wxMenu *wxCurrentPopupMenu; - // 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; -*/ -} +// ---------------------------------------------------------------------------- +// constants +// ---------------------------------------------------------------------------- -void wxMenu::Break(void) +// the (popup) menu title has this special id +static const int idMenuTitle = -2; + +// ---------------------------------------------------------------------------- +// private functions +// ---------------------------------------------------------------------------- + +// make the given menu item default +static void SetDefaultMenuItem(HMENU hmenu, UINT id) { - m_doBreak = TRUE ; +#ifndef __WXWINCE__ + MENUITEMINFO mii; + wxZeroMemory(mii); + mii.cbSize = sizeof(MENUITEMINFO); + mii.fMask = MIIM_STATE; + mii.fState = MFS_DEFAULT; + + if ( !::SetMenuItemInfo(hmenu, id, FALSE, &mii) ) + { + wxLogLastError(wxT("SetMenuItemInfo")); + } +#endif } -// function appends a new item or submenu to the menu -void wxMenu::Append(wxMenuItem *pItem) +#ifdef __WXWINCE__ +UINT GetMenuState(HMENU hMenu, UINT id, UINT flags) { - wxCHECK_RET( pItem != NULL, "can't append NULL item to the menu" ); - - m_menuItems.Append(pItem); - - UINT flags = 0; - - if ( m_doBreak ) { - flags |= MF_MENUBREAK; - m_doBreak = FALSE; - } - - if ( pItem->IsSeparator() ) { - flags |= MF_SEPARATOR; - } + MENUITEMINFO info; + wxZeroMemory(info); + info.cbSize = sizeof(info); + info.fMask = MIIM_STATE; + if ( !GetMenuItemInfo(hMenu, id, flags & MF_BYCOMMAND ? FALSE : TRUE, & info) ) + wxLogLastError(wxT("GetMenuItemInfo")); + return info.fState; +} +#endif - // 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 ); +// ============================================================================ +// implementation +// ============================================================================ - id = (UINT)SubMenu->m_hMenu; +IMPLEMENT_DYNAMIC_CLASS(wxMenu, wxEvtHandler) +IMPLEMENT_DYNAMIC_CLASS(wxMenuBar, wxWindow) - SubMenu->m_topLevelMenu = m_topLevelMenu; - SubMenu->m_parent = this; - SubMenu->m_savehMenu = (WXHMENU)id; - SubMenu->m_hMenu = 0; +/* + TODO PROPERTIES + wxMenu + label + help + + separator + break + label + accel + radio + checkable + help + bitmap + wxMenuItem +*/ - flags |= MF_POPUP; - } - else { - id = pItem->GetId(); - } +// --------------------------------------------------------------------------- +// wxMenu construction, adding and removing menu items +// --------------------------------------------------------------------------- - LPCSTR pData; - wxString name(""); +// Construct a menu with optional title (then use append) +void wxMenu::Init() +{ + m_doBreak = FALSE; + m_startRadioGroup = -1; -#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 -#endif - { - // menu is just a normal string (passed in data parameter) - flags |= MF_STRING; - name = pItem->GetName(); - pData = (const char*) name; - } + // create the menu + m_hMenu = (WXHMENU)CreatePopupMenu(); + if ( !m_hMenu ) + { + wxLogLastError(wxT("CreatePopupMenu")); + } - // VZ: what does this magic -2 mean? I just copied the code but have no idea - // about what it does... ### - if ( pItem->GetId() == -2 ) { - flags |= MF_DISABLED | MF_GRAYED; - } + // if we have a title, insert it in the beginning of the menu + if ( !!m_title ) + { + Append(idMenuTitle, m_title); + AppendSeparator(); + } +} - HMENU hMenu = (HMENU)((m_hMenu == 0) ? m_savehMenu : m_hMenu); +// The wxWindow destructor will take care of deleting the submenus. +wxMenu::~wxMenu() +{ + // we should free Windows resources only if Windows doesn't do it for us + // which happens if we're attached to a menubar or a submenu of another + // menu + if ( !IsAttached() && !GetParent() ) + { + if ( !::DestroyMenu(GetHmenu()) ) + { + wxLogLastError(wxT("DestroyMenu")); + } + } - if ( !AppendMenu(hMenu, flags, id, pData) ) - { - // wxLogLastError("AppendMenu"); - } +#if wxUSE_ACCEL + // delete accels + WX_CLEAR_ARRAY(m_accels); +#endif // wxUSE_ACCEL +} - m_noItems++; +void wxMenu::Break() +{ + // this will take effect during the next call to Append() + m_doBreak = TRUE; } -void wxMenu::AppendSeparator(void) +void wxMenu::Attach(wxMenuBarBase *menubar) { - Append(new wxMenuItem(this, ID_SEPARATOR)); + wxMenuBase::Attach(menubar); + + EndRadioGroup(); } -// Pullright item -void wxMenu::Append(int Id, const wxString& label, wxMenu *SubMenu, - const wxString& helpString) +#if wxUSE_ACCEL + +int wxMenu::FindAccel(int id) const { - Append(new wxMenuItem(this, Id, label, helpString, FALSE, SubMenu)); + size_t n, count = m_accels.GetCount(); + for ( n = 0; n < count; n++ ) + { + if ( m_accels[n]->m_command == id ) + return n; + } + + return wxNOT_FOUND; } -// Ordinary menu item -void wxMenu::Append(int Id, const wxString& label, - const wxString& helpString, bool checkable) +void wxMenu::UpdateAccel(wxMenuItem *item) { - // 'checkable' parameter is useless for Windows. - Append(new wxMenuItem(this, Id, label, helpString, checkable)); + if ( item->IsSubMenu() ) + { + wxMenu *submenu = item->GetSubMenu(); + wxMenuItemList::compatibility_iterator node = submenu->GetMenuItems().GetFirst(); + while ( node ) + { + UpdateAccel(node->GetData()); + + node = node->GetNext(); + } + } + else if ( !item->IsSeparator() ) + { + // 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(); + } + } + //else: it is a separator, they can't have accels, nothing to do } -void wxMenu::Delete(int id) +#endif // wxUSE_ACCEL + +// append a new item or submenu to the menu +bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos) { - wxNode *node; - wxMenuItem *item; - int pos; - HMENU menu; +#if wxUSE_ACCEL + UpdateAccel(pItem); +#endif // wxUSE_ACCEL - for (pos = 0, node = m_menuItems.First(); node; node = node->Next(), pos++) { - item = (wxMenuItem *)node->Data(); - if (item->GetId() == id) - break; - } + UINT flags = 0; - if (!node) - return; + // 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; + } - menu = (HMENU)(m_hMenu ? m_hMenu : m_savehMenu); + if ( pItem->IsSeparator() ) { + flags |= MF_SEPARATOR; + } - 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); - } + // 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_MSG( submenu->GetHMenu(), wxT("invalid submenu") ); - m_menuItems.DeleteNode(node); - delete item; -} + submenu->SetParent(this); -void wxMenu::Enable(int Id, bool Flag) -{ - wxMenuItem *item = FindItemForId(Id); - wxCHECK_RET( item != NULL, "can't enable non-existing menu item" ); + id = (UINT)submenu->GetHMenu(); - item->Enable(Flag); -} + flags |= MF_POPUP; + } + else { + id = pItem->GetId(); + } -bool wxMenu::Enabled(int Id) const -{ - wxMenuItem *item = FindItemForId(Id); - wxCHECK( item != NULL, FALSE ); +#ifdef __WXWINCE__ + wxString strippedString; +#endif - return item->IsEnabled(); -} + LPCTSTR pData; -void wxMenu::Check(int Id, bool Flag) -{ - wxMenuItem *item = FindItemForId(Id); - wxCHECK_RET( item != NULL, "can't get status of non-existing menu item" ); +#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 = (LPCTSTR)pItem; + } + else +#endif + { + // menu is just a normal string (passed in data parameter) + flags |= MF_STRING; + +#ifdef __WXWINCE__ + strippedString = wxStripMenuCodes(pItem->GetText()); + pData = (wxChar*)strippedString.c_str(); +#else + pData = (wxChar*)pItem->GetText().c_str(); +#endif + } - item->Check(Flag); -} + BOOL ok; + if ( pos == (size_t)-1 ) + { + ok = ::AppendMenu(GetHmenu(), flags, id, pData); + } + else + { + ok = ::InsertMenu(GetHmenu(), pos, flags | MF_BYPOSITION, id, pData); + } -bool wxMenu::Checked(int Id) const -{ - wxMenuItem *item = FindItemForId(Id); - wxCHECK( item != NULL, FALSE ); + if ( !ok ) + { + wxLogLastError(wxT("Insert or AppendMenu")); - return item->IsChecked(); -} + return FALSE; + } -void wxMenu::SetTitle(const wxString& label) -{ - m_title = label ; - if (m_hMenu) - ModifyMenu((HMENU)m_hMenu, 0, - MF_BYPOSITION | MF_STRING | MF_DISABLED, - (UINT)-2, (const char *)m_title); - else if (m_savehMenu) - ModifyMenu((HMENU)m_savehMenu, 0, - MF_BYPOSITION | MF_STRING | MF_DISABLED, - (UINT)-2, (const char *)m_title); + // if we just appended the title, highlight it +#ifdef __WIN32__ + if ( (int)id == idMenuTitle ) + { + // visually select the menu title + SetDefaultMenuItem(GetHmenu(), id); + } +#endif // __WIN32__ + + // if we're already attached to the menubar, we must update it + if ( IsAttached() && m_menuBar->IsAttached() ) + { + m_menuBar->Refresh(); + } + + return TRUE; } -const wxString wxMenu::GetTitle() const +void wxMenu::EndRadioGroup() { - return m_title; + // we're not inside a radio group any longer + m_startRadioGroup = -1; } -void wxMenu::SetLabel(int Id, const wxString& label) +bool wxMenu::DoAppend(wxMenuItem *item) { - wxMenuItem *item = FindItemForId(Id) ; - if (item==NULL) - return; + wxCHECK_MSG( item, FALSE, _T("NULL item in wxMenu::DoAppend") ); - if (item->GetSubMenu()==NULL) - { - if (m_hMenu) + bool check = FALSE; + + if ( item->GetKind() == wxITEM_RADIO ) { - 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) ; + int count = GetMenuItemCount(); + + if ( m_startRadioGroup == -1 ) + { + // start a new radio group + m_startRadioGroup = count; + + // for now it has just one element + item->SetAsRadioGroupStart(); + item->SetRadioGroupEnd(m_startRadioGroup); + + // ensure that we have a checked item in the radio group + check = TRUE; + } + else // extend the current radio group + { + // we need to update its end item + item->SetRadioGroupStart(m_startRadioGroup); + wxMenuItemList::compatibility_iterator node = GetMenuItems().Item(m_startRadioGroup); + + if ( node ) + { + node->GetData()->SetRadioGroupEnd(count); + } + else + { + wxFAIL_MSG( _T("where is the radio group start item?") ); + } + } } - else if (m_savehMenu) + else // not a radio item { - 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) ; + EndRadioGroup(); } - } - else - { - wxMenu *father = item->GetSubMenu()->m_topLevelMenu ; - wxNode *node = father->m_menuItems.First() ; - int i = 0 ; - while (node) + + if ( !wxMenuBase::DoAppend(item) || !DoInsertOrAppend(item) ) { - wxMenuItem *matched = (wxMenuItem*)node->Data() ; - if (matched==item) - break ; - i++ ; - node = node->Next() ; + return FALSE; } - // 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); -} -wxString wxMenu::GetLabel(int Id) 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) ; + if ( check ) + { + // check the item initially + item->Check(TRUE); + } + + return TRUE; } -bool wxMenu::MSWCommand(WXUINT WXUNUSED(param), WXWORD id) +bool wxMenu::DoInsert(size_t pos, wxMenuItem *item) { - wxCommandEvent event(wxEVENT_TYPE_MENU_COMMAND); - event.SetEventObject( this ); - event.SetId( id ); - event.SetInt( id ); - ProcessCommand(event); - return TRUE; + return wxMenuBase::DoInsert(pos, item) && DoInsertOrAppend(item, pos); } -// Finds the item id matching the given string, -1 if not found. -int wxMenu::FindItem (const wxString& itemString) const +wxMenuItem *wxMenu::DoRemove(wxMenuItem *item) { - char buf1[200]; - char buf2[200]; - wxStripMenuCodes ((char *)(const char *)itemString, buf1); - - for (wxNode * node = m_menuItems.First (); node; node = node->Next ()) + // we need to find the items position in the child list + size_t pos; + wxMenuItemList::compatibility_iterator 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() == item ) + break; + + node = node->GetNext(); } - return -1; -} + // DoRemove() (unlike Remove) can only be called for existing item! + wxCHECK_MSG( node, NULL, wxT("bug in wxMenu::Remove logic") ); -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 (); +#if wxUSE_ACCEL + // remove the corresponding accel from the accel table + int n = FindAccel(item->GetId()); + if ( n != wxNOT_FOUND ) + { + delete m_accels[n]; + + m_accels.RemoveAt(n); + } + //else: this item doesn't have an accel, nothing to do +#endif // wxUSE_ACCEL - if (item->GetId() == itemId) + // remove the item from the menu + if ( !::RemoveMenu(GetHmenu(), (UINT)pos, MF_BYPOSITION) ) { - if (itemMenu) - *itemMenu = (wxMenu *) this; - return item; + wxLogLastError(wxT("RemoveMenu")); } - if (item->GetSubMenu()) + if ( IsAttached() && m_menuBar->IsAttached() ) { - wxMenuItem *ans = item->GetSubMenu()->FindItemForId (itemId, itemMenu); - if (ans) - return ans; + // otherwise, the chane won't be visible + m_menuBar->Refresh(); } - } - if (itemMenu) - *itemMenu = NULL; - return NULL; + // and from internal data structures + return wxMenuBase::DoRemove(item); } -void wxMenu::SetHelpString(int itemId, const wxString& helpString) -{ - wxMenuItem *item = FindItemForId (itemId); - if (item) - item->SetHelp(helpString); -} +// --------------------------------------------------------------------------- +// accelerator helpers +// --------------------------------------------------------------------------- -wxString wxMenu::GetHelpString (int itemId) const -{ - wxMenuItem *item = FindItemForId (itemId); - wxString str(""); - return (item == NULL) ? str : item->GetHelp(); -} +#if wxUSE_ACCEL -void wxMenu::ProcessCommand(wxCommandEvent & event) +// 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 { - bool processed = FALSE; + size_t count = GetAccelCount(); + for ( size_t n = 0; n < count; n++ ) + { + *accels++ = *m_accels[n]; + } - // Try a callback - if (m_callback) - { - (void) (*(m_callback)) (*this, event); - processed = TRUE; - } + return count; +} - // Try the menu's event handler - if ( !processed && GetEventHandler()) - { - processed = GetEventHandler()->ProcessEvent(event); - } +#endif // wxUSE_ACCEL - // Try the window the menu was popped up from (and up - // through the hierarchy) - if ( !processed && GetInvokingWindow()) - processed = GetInvokingWindow()->ProcessEvent(event); -} +// --------------------------------------------------------------------------- +// set wxMenu title +// --------------------------------------------------------------------------- -extern wxMenu *wxCurrentPopupMenu; -bool wxWindow::PopupMenu(wxMenu *menu, int x, int y) +void wxMenu::SetTitle(const wxString& label) { - menu->SetInvokingWindow(this); + bool hasNoTitle = m_title.IsEmpty(); + m_title = label; - 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; + HMENU hMenu = GetHmenu(); - menu->SetInvokingWindow(NULL); + 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(wxT("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(wxT("RemoveMenu")); + } + } + else + { + // modify the title +#ifdef __WXWINCE__ + MENUITEMINFO info; + wxZeroMemory(info); + info.cbSize = sizeof(info); + info.fMask = MIIM_TYPE; + info.fType = MFT_STRING; + info.cch = m_title.Length(); + info.dwTypeData = (LPTSTR) m_title.c_str(); + if ( !SetMenuItemInfo(hMenu, 0, TRUE, & info) ) + { + wxLogLastError(wxT("SetMenuItemInfo")); + } +#else + if ( !ModifyMenu(hMenu, 0u, + MF_BYPOSITION | MF_STRING, + (unsigned)idMenuTitle, m_title) ) + { + wxLogLastError(wxT("ModifyMenu")); + } +#endif + } + } - return TRUE; +#ifdef __WIN32__ + // put the title string in bold face + if ( !m_title.IsEmpty() ) + { + SetDefaultMenuItem(GetHmenu(), (UINT)idMenuTitle); + } +#endif // Win32 } -// Menu Bar -wxMenuBar::wxMenuBar(void) +// --------------------------------------------------------------------------- +// event processing +// --------------------------------------------------------------------------- + +bool wxMenu::MSWCommand(WXUINT WXUNUSED(param), WXWORD id) { - m_eventHandler = this; + // ignore commands from the menu title + + // NB: VC++ generates wrong assembler for `if ( id != idMenuTitle )'!! + if ( id != (WXWORD)idMenuTitle ) + { + // VZ: previosuly, the command int was set to id too which was quite + // useless anyhow (as it could be retrieved using GetId()) and + // uncompatible with wxGTK, so now we use the command int instead + // to pass the checked status + UINT menuState = ::GetMenuState(GetHmenu(), id, MF_BYCOMMAND) ; + SendEvent(id, menuState & MF_CHECKED); + } - m_menuCount = 0; - m_menus = NULL; - m_titles = NULL; - m_menuBarFrame = NULL; - m_hMenu = 0; + return TRUE; } -wxMenuBar::wxMenuBar(int N, wxMenu *Menus[], const wxString Titles[]) +// --------------------------------------------------------------------------- +// other +// --------------------------------------------------------------------------- + +wxWindow *wxMenu::GetWindow() const { - 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; + if ( m_invokingWindow != NULL ) + return m_invokingWindow; + else if ( m_menuBar != NULL) + return m_menuBar->GetFrame(); - m_hMenu = 0; + return NULL; } -wxMenuBar::~wxMenuBar(void) -{ - // 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; +// --------------------------------------------------------------------------- +// Menu Bar +// --------------------------------------------------------------------------- - 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; -*/ +void wxMenuBar::Init() +{ + m_eventHandler = this; + m_hMenu = 0; +#ifdef __WXWINCE__ + m_toolBar = NULL; +#endif } -// 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) +wxMenuBar::wxMenuBar() { - int ms_flag; - if (Flag) - ms_flag = MF_ENABLED; - else - ms_flag = MF_GRAYED; - - 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); - + Init(); } -void wxMenuBar::EnableTop(int pos, bool flag) +wxMenuBar::wxMenuBar( long WXUNUSED(style) ) { - int ms_flag; - if (flag) - ms_flag = MF_ENABLED; - else - ms_flag = MF_GRAYED; - - EnableMenuItem((HMENU)m_hMenu, pos, MF_BYPOSITION | ms_flag); - DrawMenuBar((HWND) m_menuBarFrame->GetHWND()) ; + Init(); } -// Must only be used AFTER menu has been attached to frame, -// otherwise use individual menus -void wxMenuBar::Check(int Id, bool Flag) +wxMenuBar::wxMenuBar(int count, wxMenu *menus[], const wxString titles[]) { - 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; + Init(); - 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); + m_titles.Alloc(count); -// CheckMenuItem((HMENU)m_hMenu, Id, MF_BYCOMMAND | ms_flag); + for ( int i = 0; i < count; i++ ) + { + m_menus.Append(menus[i]); + m_titles.Add(titles[i]); + + menus[i]->Attach(this); + } } -bool wxMenuBar::Checked(int Id) const +wxMenuBar::~wxMenuBar() { - wxMenu *itemMenu = NULL; - wxMenuItem *item = FindItemForId(Id, &itemMenu) ; - if (!item) - return FALSE; - - int Flag ; + // In Windows CE, the menubar is always associated + // with a toolbar, which destroys the menu implicitly. +#ifdef __WXWINCE__ + if (GetToolBar()) + GetToolBar()->SetMenuBar(NULL); +#else + // we should free Windows resources only if Windows doesn't do it for us + // which happens if we're attached to a frame + if (m_hMenu && !IsAttached()) + { + ::DestroyMenu((HMENU)m_hMenu); + m_hMenu = (WXHMENU)NULL; + } +#endif +} - 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) ; +// --------------------------------------------------------------------------- +// wxMenuBar helpers +// --------------------------------------------------------------------------- -// Flag=GetMenuState((HMENU)m_hMenu, Id, MF_BYCOMMAND) ; +void wxMenuBar::Refresh() +{ + wxCHECK_RET( IsAttached(), wxT("can't refresh unattached menubar") ); - if (Flag&MF_CHECKED) - return TRUE ; - else - return FALSE ; +#ifdef __WXWINCE__ + if (GetToolBar()) + { + CommandBar_DrawMenuBar((HWND) GetToolBar()->GetHWND(), 0); + } +#else + DrawMenuBar(GetHwndOf(GetFrame())); +#endif } -bool wxMenuBar::Enabled(int Id) const +WXHMENU wxMenuBar::Create() { - wxMenu *itemMenu = NULL; - wxMenuItem *item = FindItemForId(Id, &itemMenu) ; - if (!item) - return FALSE; + // Note: this totally doesn't work on Smartphone, + // since you have to use resources. + // We'll have to find another way to add a menu + // by changing/adding menu items to an existing menu. +#ifdef __WXWINCE__ + if ( m_hMenu != 0 ) + return m_hMenu; + + if (!GetToolBar()) + return 0; + + HWND hCommandBar = (HWND) GetToolBar()->GetHWND(); + HMENU hMenu = (HMENU)::SendMessage(hCommandBar, SHCMBM_GETMENU, (WPARAM)0, (LPARAM)0); + if (hMenu) + { + TBBUTTON tbButton; + memset(&tbButton, 0, sizeof(TBBUTTON)); + tbButton.iBitmap = I_IMAGENONE; + tbButton.fsState = TBSTATE_ENABLED; + tbButton.fsStyle = TBSTYLE_DROPDOWN | TBSTYLE_NO_DROPDOWN_ARROW | TBSTYLE_AUTOSIZE; + + size_t i; + for (i = 0; i < GetMenuCount(); i++) + { + HMENU hPopupMenu = (HMENU) GetMenu(i)->GetHMenu() ; + tbButton.dwData = (DWORD)hPopupMenu; + wxString label = wxStripMenuCodes(GetLabelTop(i)); + tbButton.iString = (int) label.c_str(); + + int position = i; + + tbButton.idCommand = NewControlId(); + if (!::SendMessage(hCommandBar, TB_INSERTBUTTON, position, (LPARAM)&tbButton)) + { + wxLogLastError(wxT("TB_INSERTBUTTON")); + } + } + } + m_hMenu = (WXHMENU) hMenu; + return m_hMenu; +#else + if ( m_hMenu != 0 ) + return m_hMenu; - int Flag ; + m_hMenu = (WXHMENU)::CreateMenu(); - 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) ; + if ( !m_hMenu ) + { + wxLogLastError(wxT("CreateMenu")); + } + else + { + size_t count = GetMenuCount(), i; + wxMenuList::iterator it; + for ( i = 0, it = m_menus.begin(); i < count; i++, it++ ) + { + if ( !::AppendMenu((HMENU)m_hMenu, MF_POPUP | MF_STRING, + (UINT)(*it)->GetHMenu(), + m_titles[i]) ) + { + wxLogLastError(wxT("AppendMenu")); + } + } + } - if (Flag&MF_ENABLED) - return TRUE ; - else - return FALSE ; + return m_hMenu; +#endif } +// --------------------------------------------------------------------------- +// wxMenuBar functions to work with the top level submenus +// --------------------------------------------------------------------------- -void wxMenuBar::SetLabel(int Id, const wxString& label) -{ - wxMenu *itemMenu = NULL; - wxMenuItem *item = FindItemForId(Id, &itemMenu) ; - - if (!item) - return; - - 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) ; - } -} +// 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 -wxString wxMenuBar::GetLabel(int Id) const +void wxMenuBar::EnableTop(size_t pos, bool enable) { - wxMenu *itemMenu = NULL; - wxMenuItem *item = FindItemForId(Id, &itemMenu) ; + wxCHECK_RET( IsAttached(), wxT("doesn't work with unattached menubars") ); - if (!item) - return wxString(""); + int flag = enable ? MF_ENABLED : MF_GRAYED; - 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) ; - } + EnableMenuItem((HMENU)m_hMenu, pos, MF_BYPOSITION | flag); -// int len = GetMenuString((HMENU)m_hMenu,Id,tmp,127,MF_BYCOMMAND) ; - tmp[len] = '\0' ; - return wxString(tmp) ; + Refresh(); } -void wxMenuBar::SetLabelTop(int pos, const wxString& label) +void wxMenuBar::SetLabelTop(size_t 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) ; -} + wxCHECK_RET( pos < GetMenuCount(), wxT("invalid menu index") ); -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); -} + m_titles[pos] = label; -bool wxMenuBar::OnDelete(wxMenu *a_menu, int pos) -{ - if (!m_menuBarFrame) - return TRUE; + if ( !IsAttached() ) + { + return; + } + //else: have to modify the existing menu + + UINT id; + UINT flagsOld = ::GetMenuState((HMENU)m_hMenu, pos, MF_BYPOSITION); + if ( flagsOld == 0xFFFFFFFF ) + { + wxLogLastError(wxT("GetMenuState")); - 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; + return; + } - if (m_menuBarFrame) { - DrawMenuBar((HWND) m_menuBarFrame->GetHWND()) ; - } + 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; + } - return TRUE; - } +#ifdef __WXWINCE__ + MENUITEMINFO info; + wxZeroMemory(info); + info.cbSize = sizeof(info); + info.fMask = MIIM_TYPE; + info.fType = MFT_STRING; + info.cch = label.Length(); + info.dwTypeData = (LPTSTR) label.c_str(); + if ( !SetMenuItemInfo(GetHmenu(), id, TRUE, & info) ) + { + wxLogLastError(wxT("SetMenuItemInfo")); + } + +#else + if ( ::ModifyMenu(GetHmenu(), pos, MF_BYPOSITION | MF_STRING | flagsOld, + id, label) == (int)0xFFFFFFFF ) + { + wxLogLastError(wxT("ModifyMenu")); + } +#endif - return FALSE; + Refresh(); } -bool wxMenuBar::OnAppend(wxMenu *a_menu, const char *title) +wxString wxMenuBar::GetLabelTop(size_t pos) const { - if (!a_menu->m_hMenu) - return FALSE; + wxCHECK_MSG( pos < GetMenuCount(), wxEmptyString, + wxT("invalid menu index in wxMenuBar::GetLabelTop") ); + + return m_titles[pos]; +} - if (!m_menuBarFrame) - return TRUE; +// --------------------------------------------------------------------------- +// wxMenuBar construction +// --------------------------------------------------------------------------- - a_menu->m_savehMenu = a_menu->m_hMenu; - a_menu->m_hMenu = 0; +wxMenu *wxMenuBar::Replace(size_t pos, wxMenu *menu, const wxString& title) +{ + wxMenu *menuOld = wxMenuBarBase::Replace(pos, menu, title); + if ( !menuOld ) + return NULL; - AppendMenu((HMENU)m_hMenu, MF_POPUP | MF_STRING, (UINT)a_menu->m_savehMenu, title); + m_titles[pos] = title; - DrawMenuBar((HWND) m_menuBarFrame->GetHWND()); + if ( IsAttached() ) + { + // can't use ModifyMenu() because it deletes the submenu it replaces + if ( !::RemoveMenu(GetHmenu(), (UINT)pos, MF_BYPOSITION) ) + { + wxLogLastError(wxT("RemoveMenu")); + } + + if ( !::InsertMenu(GetHmenu(), (UINT)pos, + MF_BYPOSITION | MF_POPUP | MF_STRING, + (UINT)GetHmenuOf(menu), title) ) + { + wxLogLastError(wxT("InsertMenu")); + } + +#if wxUSE_ACCEL + if ( menuOld->HasAccels() || menu->HasAccels() ) + { + // need to rebuild accell table + RebuildAccelTable(); + } +#endif // wxUSE_ACCEL + + Refresh(); + } - return TRUE; + return menuOld; } -void wxMenuBar::Append (wxMenu * menu, const wxString& title) +bool wxMenuBar::Insert(size_t pos, wxMenu *menu, const wxString& title) { - if (!OnAppend(menu, title)) - return; - - m_menuCount ++; - wxMenu **new_menus = new wxMenu *[m_menuCount]; - wxString *new_titles = new wxString[m_menuCount]; - int i; + if ( !wxMenuBarBase::Insert(pos, menu, title) ) + return FALSE; - 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; + m_titles.Insert(title, pos); - m_menus[m_menuCount - 1] = (wxMenu *)menu; - m_titles[m_menuCount - 1] = title; + if ( IsAttached() ) + { +#ifdef __WXWINCE__ + if (!GetToolBar()) + return FALSE; + TBBUTTON tbButton; + memset(&tbButton, 0, sizeof(TBBUTTON)); + tbButton.iBitmap = I_IMAGENONE; + tbButton.fsState = TBSTATE_ENABLED; + tbButton.fsStyle = TBSTYLE_DROPDOWN | TBSTYLE_NO_DROPDOWN_ARROW | TBSTYLE_AUTOSIZE; + + HMENU hPopupMenu = (HMENU) menu->GetHMenu() ; + tbButton.dwData = (DWORD)hPopupMenu; + wxString label = wxStripMenuCodes(title); + tbButton.iString = (int) label.c_str(); + + tbButton.idCommand = NewControlId(); + if (!::SendMessage((HWND) GetToolBar()->GetHWND(), TB_INSERTBUTTON, pos, (LPARAM)&tbButton)) + { + wxLogLastError(wxT("TB_INSERTBUTTON")); + return FALSE; + } +#else + if ( !::InsertMenu(GetHmenu(), pos, + MF_BYPOSITION | MF_POPUP | MF_STRING, + (UINT)GetHmenuOf(menu), title) ) + { + wxLogLastError(wxT("InsertMenu")); + } +#endif +#if wxUSE_ACCEL + if ( menu->HasAccels() ) + { + // need to rebuild accell table + RebuildAccelTable(); + } +#endif // wxUSE_ACCEL + + Refresh(); + } - ((wxMenu *)menu)->m_menuBar = (wxMenuBar *) this; - ((wxMenu *)menu)->SetParent(this); + return TRUE; } -void wxMenuBar::Delete(wxMenu * menu, int i) +bool wxMenuBar::Append(wxMenu *menu, const wxString& title) { - int j; - int ii = (int) i; + WXHMENU submenu = menu ? menu->GetHMenu() : 0; + wxCHECK_MSG( submenu, FALSE, wxT("can't append invalid menu to menubar") ); - 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]; - } + if ( !wxMenuBarBase::Append(menu, title) ) + return FALSE; - if (!OnDelete(menu, ii)) - return; + m_titles.Add(title); - menu->SetParent(NULL); + if ( IsAttached() ) + { +#ifdef __WXWINCE__ + if (!GetToolBar()) + return FALSE; + TBBUTTON tbButton; + memset(&tbButton, 0, sizeof(TBBUTTON)); + tbButton.iBitmap = I_IMAGENONE; + tbButton.fsState = TBSTATE_ENABLED; + tbButton.fsStyle = TBSTYLE_DROPDOWN | TBSTYLE_NO_DROPDOWN_ARROW | TBSTYLE_AUTOSIZE; + + size_t pos = GetMenuCount(); + HMENU hPopupMenu = (HMENU) menu->GetHMenu() ; + tbButton.dwData = (DWORD)hPopupMenu; + wxString label = wxStripMenuCodes(title); + tbButton.iString = (int) label.c_str(); + + tbButton.idCommand = NewControlId(); + if (!::SendMessage((HWND) GetToolBar()->GetHWND(), TB_INSERTBUTTON, pos, (LPARAM)&tbButton)) + { + wxLogLastError(wxT("TB_INSERTBUTTON")); + return FALSE; + } +#else + if ( !::AppendMenu(GetHmenu(), MF_POPUP | MF_STRING, + (UINT)submenu, title) ) + { + wxLogLastError(wxT("AppendMenu")); + } +#endif - -- m_menuCount; - for (j = ii; j < m_menuCount; j++) { - m_menus[j] = m_menus[j + 1]; - m_titles[j] = m_titles[j + 1]; - } +#if wxUSE_ACCEL + if ( menu->HasAccels() ) + { + // need to rebuild accelerator 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 +wxMenu *wxMenuBar::Remove(size_t pos) { - char buf1[200]; - char buf2[200]; - wxStripMenuCodes ((char *)(const char *)menuString, buf1); - int i; - for (i = 0; i < m_menuCount; i++) + wxMenu *menu = wxMenuBarBase::Remove(pos); + if ( !menu ) + return NULL; + + if ( IsAttached() ) { - wxStripMenuCodes ((char *)(const char *)m_titles[i], buf2); - if (strcmp (buf1, buf2) == 0) - return m_menus[i]->FindItem (itemString); +#ifdef __WXWINCE__ + if (GetToolBar()) + { + if (!::SendMessage((HWND) GetToolBar()->GetHWND(), TB_DELETEBUTTON, (UINT) pos, (LPARAM) 0)) + { + wxLogLastError(wxT("TB_DELETEBUTTON")); + } + } +#else + if ( !::RemoveMenu(GetHmenu(), (UINT)pos, MF_BYPOSITION) ) + { + wxLogLastError(wxT("RemoveMenu")); + } +#endif +#if wxUSE_ACCEL + if ( menu->HasAccels() ) + { + // need to rebuild accell table + RebuildAccelTable(); + } +#endif // wxUSE_ACCEL + + Refresh(); } - return -1; -} -wxMenuItem *wxMenuBar::FindItemForId (int Id, wxMenu ** itemMenu) const -{ - if (itemMenu) - *itemMenu = NULL; + m_titles.RemoveAt(pos); - wxMenuItem *item = NULL; - int i; - for (i = 0; i < m_menuCount; i++) - if ((item = m_menus[i]->FindItemForId (Id, itemMenu))) - return item; - return NULL; + return menu; } -void wxMenuBar::SetHelpString (int Id, const wxString& helpString) +#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(); + wxMenuList::iterator it; + for ( i = 0, it = m_menus.begin(); i < count; i++, it++ ) { - if (m_menus[i]->FindItemForId (Id)) - { - m_menus[i]->SetHelpString (Id, helpString); - return; - } + nAccelCount += (*it)->GetAccelCount(); } -} -wxString wxMenuBar::GetHelpString (int Id) const -{ - int i; - for (i = 0; i < m_menuCount; i++) + if ( nAccelCount ) { - if (m_menus[i]->FindItemForId (Id)) - return wxString(m_menus[i]->GetHelpString (Id)); + wxAcceleratorEntry *accelEntries = new wxAcceleratorEntry[nAccelCount]; + + nAccelCount = 0; + for ( i = 0, it = m_menus.begin(); i < count; i++, it++ ) + { + nAccelCount += (*it)->CopyAccels(&accelEntries[nAccelCount]); + } + + m_accelTable = wxAcceleratorTable(nAccelCount, accelEntries); + + delete [] accelEntries; } - return wxString(""); } -wxWindow *wxMenu::GetWindow() const -{ - if ( m_pInvokingWindow != NULL ) - return m_pInvokingWindow; - if ( m_menuBar != NULL) - return m_menuBar->m_menuBarFrame; - return NULL; -} +#endif // wxUSE_ACCEL -WXHMENU wxMenu::GetHMenu() const +void wxMenuBar::Attach(wxFrame *frame) { - if ( m_hMenu != 0 ) - return m_hMenu; - else if ( m_savehMenu != 0 ) - return m_savehMenu; + wxMenuBarBase::Attach(frame); - return 0; +#if wxUSE_ACCEL + RebuildAccelTable(); +#endif // wxUSE_ACCEL +} + +void wxMenuBar::Detach() +{ + wxMenuBarBase::Detach(); } +#endif // wxUSE_MENUS