X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/837e57436a89516a5fa9f478f401e06bd872c17c..342751763793b5cdad252d731aac0618d0674e5b:/src/msw/menu.cpp?ds=sidebyside diff --git a/src/msw/menu.cpp b/src/msw/menu.cpp index b89b794879..0894f1f6cf 100644 --- a/src/msw/menu.cpp +++ b/src/msw/menu.cpp @@ -33,6 +33,7 @@ #include "wx/menu.h" #include "wx/utils.h" #include "wx/intl.h" + #include "wx/log.h" #endif #if wxUSE_OWNER_DRAWN @@ -40,9 +41,6 @@ #endif #include "wx/msw/private.h" -#include "wx/msw/menu.h" -#include "wx/menuitem.h" -#include "wx/log.h" // other standard headers #include @@ -64,14 +62,8 @@ static const int idMenuTitle = -2; // macros // ---------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxMenu, wxEvtHandler) IMPLEMENT_DYNAMIC_CLASS(wxMenuBar, wxEvtHandler) -#endif - -// convenience macros -#define GetHMENU() ((HMENU)GetHMenu()) -#define GetHMenuOf(menu) ((HMENU)menu->GetHMenu()) // ============================================================================ // implementation @@ -82,131 +74,105 @@ static const int idMenuTitle = -2; // --------------------------------------------------------------------------- // Construct a menu with optional title (then use append) -wxMenu::wxMenu(const wxString& title, const wxFunction func) - : m_title(title) +void wxMenu::Init() { - 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; + m_doBreak = FALSE; - if ( !!m_title ) + // create the menu + m_hMenu = (WXHMENU)CreatePopupMenu(); + if ( !m_hMenu ) { - Append(idMenuTitle, m_title) ; - AppendSeparator() ; + wxLogLastError("CreatePopupMenu"); } -#if WXWIN_COMPATIBILITY - Callback(func); -#endif + // if we have a title, insert it in the beginning of the menu + if ( !!m_title ) + { + Append(idMenuTitle, m_title); + AppendSeparator(); + } } // The wxWindow destructor will take care of deleting the submenus. wxMenu::~wxMenu() { - // free Windows resources - if ( m_hMenu ) + // 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() ) { - ::DestroyMenu((HMENU)m_hMenu); - m_hMenu = 0; + if ( !::DestroyMenu(GetHmenu()) ) + { + wxLogLastError("DestroyMenu"); + } } - // 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; - } +#if wxUSE_ACCEL + // delete accels + WX_CLEAR_ARRAY(m_accels); +#endif // wxUSE_ACCEL } void wxMenu::Break() { + // this will take effect during the next call to Append() m_doBreak = TRUE; } -// function appends a new item or submenu to the menu -void wxMenu::Append(wxMenuItem *pItem) +#if wxUSE_ACCEL + +int wxMenu::FindAccel(int id) const { - wxCHECK_RET( pItem != NULL, _T("can't append NULL item to the menu") ); + size_t n, count = m_accels.GetCount(); + for ( n = 0; n < count; n++ ) + { + if ( m_accels[n]->m_command == id ) + return n; + } -#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]); - } - } + return wxNOT_FOUND; +} - 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()); - } - } - } +void wxMenu::UpdateAccel(wxMenuItem *item) +{ + // find the (new) accel for this item + wxAcceleratorEntry *accel = wxGetAccelFromString(item->GetText()); + if ( accel ) + accel->m_command = item->GetId(); - if ( keyCode ) { - // do add an entry - m_accelKeyCodes.Add(keyCode); - m_accelFlags.Add(accelFlags); - m_accelIds.Add(pItem->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.Remove(n); } + + if ( IsAttached() ) + { + m_menuBar->RebuildAccelTable(); + } +} + +#endif // wxUSE_ACCEL + +// append a new item or submenu to the menu +bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos) +{ +#if wxUSE_ACCEL + UpdateAccel(pItem); #endif // wxUSE_ACCEL UINT flags = 0; @@ -227,13 +193,11 @@ void wxMenu::Append(wxMenuItem *pItem) UINT id; wxMenu *submenu = pItem->GetSubMenu(); if ( submenu != NULL ) { - wxASSERT( submenu->GetHMenu() != (WXHMENU) NULL ); + wxASSERT_MSG( submenu->GetHMenu(), wxT("invalid submenu") ); + + submenu->SetParent(this); 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; } @@ -254,17 +218,31 @@ void wxMenu::Append(wxMenuItem *pItem) { // menu is just a normal string (passed in data parameter) flags |= MF_STRING; - pData = label; + + pData = (wxChar*)pItem->GetText().c_str(); + } + + BOOL ok; + if ( pos == (size_t)-1 ) + { + ok = ::AppendMenu(GetHmenu(), flags, id, pData); + } + else + { + ok = ::InsertMenu(GetHmenu(), pos, flags | MF_BYPOSITION, id, pData); } - if ( !::AppendMenu(GetHMENU(), flags, id, pData) ) + if ( !ok ) { - wxLogLastError("AppendMenu"); + wxLogLastError("Insert or AppendMenu"); + + return FALSE; } else { + // if we just appended the title, highlight it #ifdef __WIN32__ - if ( id == idMenuTitle ) + if ( (int)id == idMenuTitle ) { // visually select the menu title MENUITEMINFO mii; @@ -272,86 +250,83 @@ void wxMenu::Append(wxMenuItem *pItem) mii.fMask = MIIM_STATE; mii.fState = MFS_DEFAULT; - if ( !SetMenuItemInfo(GetHMENU(), (unsigned)id, FALSE, &mii) ) + if ( !SetMenuItemInfo(GetHmenu(), (unsigned)id, FALSE, &mii) ) { - wxLogLastError(_T("SetMenuItemInfo")); + wxLogLastError(wxT("SetMenuItemInfo")); } } #endif // __WIN32__ - m_menuItems.Append(pItem); - m_noItems++; - } -} + // if we're already attached to the menubar, we must update it + if ( IsAttached() ) + { + m_menuBar->Refresh(); + } -void wxMenu::AppendSeparator() -{ - Append(new wxMenuItem(this, ID_SEPARATOR)); + return TRUE; + } } -// Pullright item -void wxMenu::Append(int id, - const wxString& label, - wxMenu *SubMenu, - const wxString& helpString) +bool wxMenu::DoAppend(wxMenuItem *item) { - Append(new wxMenuItem(this, id, label, helpString, FALSE, SubMenu)); + return wxMenuBase::DoAppend(item) && DoInsertOrAppend(item); } -// Ordinary menu item -void wxMenu::Append(int id, - const wxString& label, - const wxString& helpString, - bool checkable) +bool wxMenu::DoInsert(size_t pos, wxMenuItem *item) { - // 'checkable' parameter is useless for Windows. - Append(new wxMenuItem(this, id, label, helpString, checkable)); + return wxMenuBase::DoInsert(pos, item) && DoInsertOrAppend(item, pos); } -// delete item by id -void wxMenu::Delete(int id) +wxMenuItem *wxMenu::DoRemove(wxMenuItem *item) { - wxMenuItem *item = NULL; - int pos; - wxNode *node; - for (pos = 0, node = m_menuItems.First(); node; node = node->Next(), pos++) + // we need to find the items position in the child list + size_t pos; + wxMenuItemList::Node *node = GetMenuItems().GetFirst(); + for ( pos = 0; node; pos++ ) { - item = (wxMenuItem *)node->Data(); - if ( item->GetId() == id ) + if ( node->GetData() == item ) break; + + node = node->GetNext(); } - 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(); + // DoRemove() (unlike Remove) can only be called for existing item! + wxCHECK_MSG( node, NULL, wxT("bug in wxMenu::Remove logic") ); + +#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.Remove(n); } - else { - DeleteMenu(menu, (UINT)pos, MF_BYPOSITION); + //else: this item doesn't have an accel, nothing to do +#endif // wxUSE_ACCEL + + // remove the item from the menu + if ( !::RemoveMenu(GetHmenu(), (UINT)pos, MF_BYPOSITION) ) + { + wxLogLastError("RemoveMenu"); } - m_menuItems.DeleteNode(node); - delete item; -} + if ( IsAttached() ) + { + // otherwise, the chane won't be visible + m_menuBar->Refresh(); + } -#if wxUSE_ACCEL + // and from internal data structures + return wxMenuBase::DoRemove(item); +} // --------------------------------------------------------------------------- // accelerator helpers // --------------------------------------------------------------------------- +#if wxUSE_ACCEL + // 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 @@ -359,7 +334,7 @@ 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]); + *accels++ = *m_accels[n]; } return count; @@ -368,84 +343,7 @@ size_t wxMenu::CopyAccels(wxAcceleratorEntry *accels) const #endif // wxUSE_ACCEL // --------------------------------------------------------------------------- -// wxMenu functions implemented in wxMenuItem -// --------------------------------------------------------------------------- - -void wxMenu::Enable(int id, bool Flag) -{ - wxMenuItem *item = FindItemForId(id); - wxCHECK_RET( item != NULL, _T("can't enable non-existing menu item") ); - - item->Enable(Flag); -} - -bool wxMenu::IsEnabled(int id) const -{ - wxMenuItem *item = FindItemForId(id); - wxCHECK_MSG( item != NULL, FALSE, _T("invalid item id") ); - - return item->IsEnabled(); -} - -void wxMenu::Check(int id, bool Flag) -{ - wxMenuItem *item = FindItemForId(id); - wxCHECK_RET( item != NULL, _T("can't get status of non-existing menu item") ); - - item->Check(Flag); -} - -bool wxMenu::IsChecked(int id) const -{ - wxMenuItem *item = FindItemForId(id); - wxCHECK_MSG( item != NULL, FALSE, _T("invalid item id") ); - - return item->IsChecked(); -} - -void wxMenu::SetLabel(int id, const wxString& label) -{ - wxMenuItem *item = FindItemForId(id) ; - wxCHECK_RET( item, _T("wxMenu::SetLabel: no such item") ); - - item->SetName(label); -} - -wxString wxMenu::GetLabel(int id) const -{ - wxString label; - wxMenuItem *pItem = FindItemForId(id) ; - if (pItem) - label = pItem->GetName() ; - else - wxFAIL_MSG(_T("wxMenu::GetLabel: item doesn't exist")); - - return label; -} - -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")); -} - -wxString wxMenu::GetHelpString (int itemId) const -{ - wxString help; - wxMenuItem *item = FindItemForId (itemId); - if (item) - help = item->GetHelp(); - else - wxFAIL_MSG(_T("wxMenu::GetHelpString: item doesn't exist")); - - return help; -} - -// --------------------------------------------------------------------------- -// wxMenu title +// set wxMenu title // --------------------------------------------------------------------------- void wxMenu::SetTitle(const wxString& label) @@ -453,17 +351,17 @@ void wxMenu::SetTitle(const wxString& label) bool hasNoTitle = m_title.IsEmpty(); m_title = label; - HMENU hMenu = GetHMENU(); + HMENU hMenu = GetHmenu(); 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) ) + if ( !::InsertMenu(hMenu, 0u, MF_BYPOSITION | MF_STRING, + (unsigned)idMenuTitle, m_title) || + !::InsertMenu(hMenu, 1u, MF_BYPOSITION, (unsigned)-1, NULL) ) { - wxLogLastError(_T("InsertMenu")); + wxLogLastError("InsertMenu"); } } } @@ -482,8 +380,8 @@ void wxMenu::SetTitle(const wxString& label) { // modify the title if ( !ModifyMenu(hMenu, 0u, - MF_BYPOSITION | MF_STRING, - (unsigned)idMenuTitle, m_title) ) + MF_BYPOSITION | MF_STRING, + (unsigned)idMenuTitle, m_title) ) { wxLogLastError("ModifyMenu"); } @@ -504,12 +402,7 @@ void wxMenu::SetTitle(const wxString& label) wxLogLastError("SetMenuItemInfo"); } } -#endif -} - -const wxString wxMenu::GetTitle() const -{ - return m_title; +#endif // Win32 } // --------------------------------------------------------------------------- @@ -537,14 +430,14 @@ bool wxMenu::ProcessCommand(wxCommandEvent & event) { bool processed = FALSE; -#if WXWIN_COMPATIBILITY +#if wxUSE_MENU_CALLBACK // Try a callback if (m_callback) { (void)(*(m_callback))(*this, event); processed = TRUE; } -#endif // WXWIN_COMPATIBILITY +#endif // wxUSE_MENU_CALLBACK // Try the menu's event handler if ( !processed && GetEventHandler()) @@ -561,105 +454,34 @@ bool wxMenu::ProcessCommand(wxCommandEvent & event) return processed; } -// --------------------------------------------------------------------------- -// Item search -// --------------------------------------------------------------------------- - -// 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() ) - { - 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(); - } - } - - 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() ) - { - 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; - } - } - - return item; -} - // --------------------------------------------------------------------------- // other // --------------------------------------------------------------------------- -bool wxWindow::PopupMenu(wxMenu *menu, int x, int y) -{ - menu->SetInvokingWindow(this); - menu->UpdateUI(); - - HWND hWnd = (HWND) GetHWND(); - HMENU hMenu = (HMENU)menu->GetHMenu(); - 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; - - menu->SetInvokingWindow(NULL); - - return TRUE; -} - void wxMenu::Attach(wxMenuBar *menubar) { // 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") ); + wxASSERT_MSG( !m_menuBar, wxT("menu belongs to 2 menubars, expect a crash") ); m_menuBar = menubar; - m_savehMenu = m_hMenu; - m_hMenu = 0; } void wxMenu::Detach() { - wxASSERT_MSG( m_menuBar, _T("can't detach menu if it's not attached") ); + wxASSERT_MSG( m_menuBar, wxT("can't detach menu if it's not attached") ); - m_hMenu = m_savehMenu; - m_savehMenu = 0; + m_menuBar = NULL; +} + +wxWindow *wxMenu::GetWindow() const +{ + if ( m_invokingWindow != NULL ) + return m_invokingWindow; + else if ( m_menuBar != NULL) + return m_menuBar->GetFrame(); + + return NULL; } // --------------------------------------------------------------------------- @@ -669,9 +491,6 @@ void wxMenu::Detach() void wxMenuBar::Init() { m_eventHandler = this; - m_menuCount = 0; - m_menus = NULL; - m_titles = NULL; m_menuBarFrame = NULL; m_hMenu = 0; } @@ -690,27 +509,19 @@ wxMenuBar::wxMenuBar(int count, wxMenu *menus[], const wxString titles[]) { Init(); - m_menuCount = count; - m_menus = menus; - m_titles = new wxString[count]; + m_titles.Alloc(count); - int i; - for ( i = 0; i < count; i++ ) - m_titles[i] = titles[i]; + for ( int i = 0; i < count; i++ ) + { + m_menus.Append(menus[i]); + m_titles.Add(titles[i]); - for ( i = 0; i < count; i++ ) - m_menus[i]->Attach(this); + menus[i]->Attach(this); + } } wxMenuBar::~wxMenuBar() { - for ( int i = 0; i < m_menuCount; i++ ) - { - delete m_menus[i]; - } - - delete[] m_menus; - delete[] m_titles; } // --------------------------------------------------------------------------- @@ -719,14 +530,17 @@ wxMenuBar::~wxMenuBar() void wxMenuBar::Refresh() { - wxCHECK_RET( m_menuBarFrame, _T("can't refresh a menubar withotu a frame") ); + wxCHECK_RET( IsAttached(), wxT("can't refresh unattached menubar") ); - DrawMenuBar((HWND)m_menuBarFrame->GetHWND()) ; + DrawMenuBar(GetHwndOf(m_menuBarFrame)); } WXHMENU wxMenuBar::Create() { - wxCHECK_MSG( !m_hMenu, TRUE, _T("menubar already created") ); + if (m_hMenu != 0 ) + return m_hMenu; + + wxCHECK_MSG( !m_hMenu, TRUE, wxT("menubar already created") ); m_hMenu = (WXHMENU)::CreateMenu(); @@ -736,7 +550,8 @@ WXHMENU wxMenuBar::Create() } else { - for ( int i = 0; i < m_menuCount; i++ ) + size_t count = GetMenuCount(); + for ( size_t i = 0; i < count; i++ ) { if ( !::AppendMenu((HMENU)m_hMenu, MF_POPUP | MF_STRING, (UINT)m_menus[i]->GetHMenu(), @@ -751,119 +566,40 @@ WXHMENU wxMenuBar::Create() } // --------------------------------------------------------------------------- -// wxMenuBar functions forwarded to wxMenuItem +// wxMenuBar functions to work with the top level submenus // --------------------------------------------------------------------------- -// 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 enable) -{ - wxMenu *itemMenu = NULL; - wxMenuItem *item = FindItemForId(id, &itemMenu) ; - - wxCHECK_RET( item, _T("attempt to enable an item which doesn't exist") ); - - item->Enable(enable); -} - -void wxMenuBar::EnableTop(int pos, bool enable) -{ - int flag = enable ? MF_ENABLED : MF_GRAYED;; - - 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 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); -} - -bool wxMenuBar::IsChecked(int id) const -{ - wxMenu *itemMenu = NULL; - wxMenuItem *item = FindItemForId(id, &itemMenu) ; - - wxCHECK_MSG( item, FALSE, _T("wxMenuBar::IsChecked(): no such item") ); - - int flag = ::GetMenuState(GetHMenuOf(itemMenu), id, MF_BYCOMMAND); - - return (flag & MF_CHECKED) != 0; -} - -bool wxMenuBar::IsEnabled(int id) const -{ - wxMenu *itemMenu = NULL; - wxMenuItem *item = FindItemForId(id, &itemMenu) ; - - wxCHECK_MSG( item, FALSE, _T("wxMenuBar::IsEnabled(): no such item") ); - - int flag = ::GetMenuState(GetHMenuOf(itemMenu), id, MF_BYCOMMAND) ; - - return (flag & MF_ENABLED) != 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") ); - - item->SetName(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") ); - wxCHECK_MSG( item, _T(""), _T("wxMenuBar::GetLabel(): no such item") ); + int flag = enable ? MF_ENABLED : MF_GRAYED; - return item->GetName(); -} - -void wxMenuBar::SetHelpString (int id, const wxString& helpString) -{ - wxMenu *itemMenu = NULL; - wxMenuItem *item = FindItemForId(id, &itemMenu) ; - - wxCHECK_RET( item, _T("wxMenuBar::SetHelpString(): no such item") ); + EnableMenuItem((HMENU)m_hMenu, pos, MF_BYPOSITION | flag); - item->SetHelp(helpString); + Refresh(); } -wxString wxMenuBar::GetHelpString (int id) const +void wxMenuBar::SetLabelTop(size_t pos, const wxString& label) { - wxMenu *itemMenu = NULL; - wxMenuItem *item = FindItemForId(id, &itemMenu) ; - - wxCHECK_MSG( item, _T(""), _T("wxMenuBar::GetHelpString(): no such item") ); + wxCHECK_RET( pos < GetMenuCount(), wxT("invalid menu index") ); - return item->GetHelp(); -} + m_titles[pos] = label; -// --------------------------------------------------------------------------- -// 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 + if ( !IsAttached() ) + { + return; + } + //else: have to modify the existing menu -void wxMenuBar::SetLabelTop(int pos, const wxString& label) -{ UINT id; UINT flagsOld = ::GetMenuState((HMENU)m_hMenu, pos, MF_BYPOSITION); if ( flagsOld == 0xFFFFFFFF ) { - wxLogLastError(_T("GetMenuState")); + wxLogLastError(wxT("GetMenuState")); return; } @@ -871,161 +607,192 @@ void wxMenuBar::SetLabelTop(int pos, const wxString& label) 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) ; + flagsOld &= 0xff; + id = (UINT)::GetSubMenu((HMENU)m_hMenu, pos); } else { id = pos; } - if ( ::ModifyMenu(GetHMENU(), pos, MF_BYPOSITION | MF_STRING | flagsOld, - id, label) == 0xFFFFFFFF ) + if ( ::ModifyMenu(GetHmenu(), pos, MF_BYPOSITION | MF_STRING | flagsOld, + id, label) == (int)0xFFFFFFFF ) { wxLogLastError("ModifyMenu"); } + + Refresh(); } -wxString wxMenuBar::GetLabelTop(int pos) const +wxString wxMenuBar::GetLabelTop(size_t pos) const { - int len = ::GetMenuString((HMENU)m_hMenu, pos, NULL, 0, MF_BYCOMMAND); + wxCHECK_MSG( pos < GetMenuCount(), wxEmptyString, + wxT("invalid menu index in wxMenuBar::GetLabelTop") ); + + return m_titles[pos]; +} - len++; // for the NUL character - wxString label; - ::GetMenuString(GetHMENU(), pos, label.GetWriteBuf(len), len, MF_BYCOMMAND); - label.UngetWriteBuf(); +int wxMenuBar::FindMenu(const wxString& title) +{ + wxString menuTitle = wxStripMenuCodes(title); + + size_t count = GetMenuCount(); + for ( size_t i = 0; i < count; i++ ) + { + wxString title = wxStripMenuCodes(m_titles[i]); + if ( menuTitle == title ) + return i; + } + + return wxNOT_FOUND; - return label; } // --------------------------------------------------------------------------- -// wxMenuBar notifications +// wxMenuBar construction // --------------------------------------------------------------------------- -bool wxMenuBar::OnDelete(wxMenu *a_menu, int pos) +wxMenu *wxMenuBar::Replace(size_t pos, wxMenu *menu, const wxString& title) { - if ( !m_menuBarFrame ) - return TRUE; + wxMenu *menuOld = wxMenuBarBase::Replace(pos, menu, title); + if ( !menuOld ) + return FALSE; + m_titles[pos] = title; - if ( ::RemoveMenu((HMENU)m_hMenu, (UINT)pos, MF_BYPOSITION) ) + if ( IsAttached() ) { - // 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??") ); + // can't use ModifyMenu() because it deletes the submenu it replaces + if ( !::RemoveMenu(GetHmenu(), (UINT)pos, MF_BYPOSITION) ) + { + wxLogLastError("RemoveMenu"); + } - a_menu->Detach(); + if ( !::InsertMenu(GetHmenu(), (UINT)pos, + MF_BYPOSITION | MF_POPUP | MF_STRING, + (UINT)GetHmenuOf(menu), title) ) + { + wxLogLastError("InsertMenu"); + } - if ( m_menuBarFrame ) - Refresh(); +#if wxUSE_ACCEL + if ( menuOld->HasAccels() || menu->HasAccels() ) + { + // need to rebuild accell table + RebuildAccelTable(); + } +#endif // wxUSE_ACCEL - return TRUE; - } - else - { - wxLogLastError("RemoveMenu"); + Refresh(); } - return FALSE; + return menuOld; } -bool wxMenuBar::OnAppend(wxMenu *a_menu, const wxChar *title) +bool wxMenuBar::Insert(size_t pos, wxMenu *menu, const wxString& title) { - WXHMENU submenu = a_menu->GetHMenu(); - if ( !submenu ) + if ( !wxMenuBarBase::Insert(pos, menu, title) ) return FALSE; - if ( !m_menuBarFrame ) - return TRUE; + m_titles.Insert(title, pos); - a_menu->Attach(this); + menu->Attach(this); - if ( !::AppendMenu(GetHMENU(), MF_POPUP | MF_STRING, - (UINT)submenu, title) ) + if ( IsAttached() ) { - wxLogLastError(_T("AppendMenu")); - } + if ( !::InsertMenu(GetHmenu(), pos, + MF_BYPOSITION | MF_POPUP | MF_STRING, + (UINT)GetHmenuOf(menu), title) ) + { + wxLogLastError("InsertMenu"); + } - Refresh(); +#if wxUSE_ACCEL + if ( menu->HasAccels() ) + { + // need to rebuild accell table + RebuildAccelTable(); + } +#endif // wxUSE_ACCEL + + Refresh(); + } return TRUE; } -// --------------------------------------------------------------------------- -// wxMenuBar construction -// --------------------------------------------------------------------------- - -void wxMenuBar::Append (wxMenu * menu, const wxString& title) +bool wxMenuBar::Append(wxMenu *menu, const wxString& title) { - if (!OnAppend(menu, title)) - return; + WXHMENU submenu = menu ? menu->GetHMenu() : 0; + wxCHECK_MSG( submenu, FALSE, wxT("can't append invalid menu to menubar") ); + + if ( !wxMenuBarBase::Append(menu, title) ) + return FALSE; - m_menuCount ++; - wxMenu **new_menus = new wxMenu *[m_menuCount]; - wxString *new_titles = new wxString[m_menuCount]; - int i; + menu->Attach(this); - 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) + m_titles.Add(title); + + if ( IsAttached() ) { - delete[]m_menus; - delete[]m_titles; - } - m_menus = new_menus; - m_titles = new_titles; + if ( !::AppendMenu(GetHmenu(), MF_POPUP | MF_STRING, + (UINT)submenu, title) ) + { + wxLogLastError(wxT("AppendMenu")); + } + +#if wxUSE_ACCEL + if ( menu->HasAccels() ) + { + // need to rebuild accell table + RebuildAccelTable(); + } +#endif // wxUSE_ACCEL - m_menus[m_menuCount - 1] = (wxMenu *)menu; - m_titles[m_menuCount - 1] = title; + Refresh(); + } - menu->SetParent(this); + return TRUE; } -void wxMenuBar::Delete(wxMenu * menu, int i) +wxMenu *wxMenuBar::Remove(size_t pos) { - int j; - int ii = (int) i; + wxMenu *menu = wxMenuBarBase::Remove(pos); + if ( !menu ) + return NULL; - if (menu != 0) { - for (ii = 0; ii < m_menuCount; ii++) { - if (m_menus[ii] == menu) - break; + if ( IsAttached() ) + { + if ( !::RemoveMenu(GetHmenu(), (UINT)pos, MF_BYPOSITION) ) + { + wxLogLastError("RemoveMenu"); } - if (ii >= m_menuCount) - return; - } else { - if (ii < 0 || ii >= m_menuCount) - return; - menu = m_menus[ii]; - } - if (!OnDelete(menu, ii)) - return; + menu->Detach(); - menu->SetParent(NULL); +#if wxUSE_ACCEL + if ( menu->HasAccels() ) + { + // need to rebuild accell table + RebuildAccelTable(); + } +#endif // wxUSE_ACCEL - -- m_menuCount; - for (j = ii; j < m_menuCount; j++) { - m_menus[j] = m_menus[j + 1]; - m_titles[j] = m_titles[j + 1]; + Refresh(); } -} -void wxMenuBar::Attach(wxFrame *frame) -{ - wxASSERT_MSG( !m_menuBarFrame, _T("menubar already attached!") ); + m_titles.Remove(pos); - m_menuBarFrame = frame; + return menu; +} #if wxUSE_ACCEL - // create the accel table - we consider that the menubar construction is - // finished + +void wxMenuBar::RebuildAccelTable() +{ + // merge the accelerators of all menus into one accel table size_t nAccelCount = 0; - int i; - for ( i = 0; i < m_menuCount; i++ ) + size_t i, count = GetMenuCount(); + for ( i = 0; i < count; i++ ) { nAccelCount += m_menus[i]->GetAccelCount(); } @@ -1035,7 +802,7 @@ void wxMenuBar::Attach(wxFrame *frame) wxAcceleratorEntry *accelEntries = new wxAcceleratorEntry[nAccelCount]; nAccelCount = 0; - for ( i = 0; i < m_menuCount; i++ ) + for ( i = 0; i < count; i++ ) { nAccelCount += m_menus[i]->CopyAccels(&accelEntries[nAccelCount]); } @@ -1044,9 +811,29 @@ void wxMenuBar::Attach(wxFrame *frame) delete [] accelEntries; } +} + #endif // wxUSE_ACCEL + +void wxMenuBar::Attach(wxFrame *frame) +{ +// wxASSERT_MSG( !IsAttached(), wxT("menubar already attached!") ); + + m_menuBarFrame = frame; + +#if wxUSE_ACCEL + RebuildAccelTable(); +#endif // wxUSE_ACCEL +} + +void wxMenuBar::Detach() +{ +// ::DestroyMenu((HMENU)m_hMenu); + m_hMenu = (WXHMENU)NULL; + m_menuBarFrame = NULL; } + // --------------------------------------------------------------------------- // wxMenuBar searching for menu items // --------------------------------------------------------------------------- @@ -1056,7 +843,8 @@ int wxMenuBar::FindMenuItem(const wxString& menuString, const wxString& itemString) const { wxString menuLabel = wxStripMenuCodes(menuString); - for ( int i = 0; i < m_menuCount; i++ ) + size_t count = GetMenuCount(); + for ( size_t i = 0; i < count; i++ ) { wxString title = wxStripMenuCodes(m_titles[i]); if ( menuString == title ) @@ -1066,82 +854,18 @@ int wxMenuBar::FindMenuItem(const wxString& menuString, return wxNOT_FOUND; } -wxMenuItem *wxMenuBar::FindItemForId (int id, wxMenu **itemMenu) const +wxMenuItem *wxMenuBar::FindItem(int id, wxMenu **itemMenu) const { if ( itemMenu ) *itemMenu = NULL; wxMenuItem *item = NULL; - for ( int i = 0; !item && (i < m_menuCount); i++ ) + size_t count = GetMenuCount(); + for ( size_t i = 0; !item && (i < count); i++ ) { - item = m_menus[i]->FindItemForId(id, itemMenu); + item = m_menus[i]->FindItem(id, itemMenu); } return item; } - -// ---------------------------------------------------------------------------- -// helper functions -// ---------------------------------------------------------------------------- - -wxWindow *wxMenu::GetWindow() const -{ - 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; - - wxFAIL_MSG(_T("wxMenu without HMENU")); - - 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. -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(); - } -}