-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;
- m_clientData = (void*) NULL;
-
- if (m_title != "")
- {
- Append(idMenuTitle, m_title) ;
- AppendSeparator() ;
- }
+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;
+ m_clientData = (void*) NULL;
+
+ if ( !!m_title )
+ {
+ Append(idMenuTitle, m_title) ;
+ AppendSeparator() ;
+ }
- 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;
-*/
+ 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;
+ */
- HMENU hMenu = (HMENU)((m_hMenu == 0) ? m_savehMenu : m_hMenu);
- if ( !AppendMenu(hMenu, flags, id, pData) )
- {
- wxLogLastError("AppendMenu");
- }
+ if ( !AppendMenu(GetHMENU(), flags, id, pData) )
+ {
+ wxLogLastError("AppendMenu");
+ }
-void wxMenu::Append(int Id, const wxString& label, wxMenu *SubMenu,
- const wxString& helpString)
+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));
-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));
- wxNode *node;
- int pos;
- HMENU menu;
-
- wxMenuItem *item = NULL;
- for (pos = 0, node = m_menuItems.First(); node; node = node->Next(), pos++) {
- item = (wxMenuItem *)node->Data();
- if (item->GetId() == id)
- break;
- }
-
- if (!node)
- return;
-
- menu = (HMENU)(m_hMenu ? m_hMenu : m_savehMenu);
+ 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;
+ }
- 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);
- }
+ wxCHECK_RET( node, "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);
+ }
- 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");
- }
+ 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");
+ }
+ }
- // modify the title
- if ( !ModifyMenu(hMenu, 0u,
- MF_BYPOSITION | MF_STRING,
- (unsigned)idMenuTitle, m_title) )
- {
- wxLogLastError("ModifyMenu");
- }
+ 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");
+ }
+ }
- // 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;
-
- if ( !SetMenuItemInfo(hMenu, (unsigned)idMenuTitle, FALSE, &mii) )
+ // put the title string in bold face
+ if ( !m_title.IsEmpty() )
- wxLogLastError("SetMenuItemInfo");
+ MENUITEMINFO mii;
+ mii.cbSize = sizeof(mii);
+ mii.fMask = MIIM_STATE;
+ mii.fState = MFS_DEFAULT;
+
+ if ( !SetMenuItemInfo(hMenu, (unsigned)idMenuTitle, FALSE, &mii) )
+ {
+ wxLogLastError("SetMenuItemInfo");
+ }
- 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) ;
+ HMENU hMenu = GetHMENU();
+
+ UINT was_flag = GetMenuState(hMenu, id, MF_BYCOMMAND);
+ ModifyMenu(hMenu, id, MF_BYCOMMAND | MF_STRING | was_flag, id, label);
- else if (m_savehMenu)
- {
- 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) ;
- }
- }
- else
- {
- wxMenu *father = item->GetSubMenu()->m_topLevelMenu ;
- wxNode *node = father->m_menuItems.First() ;
- int i = 0 ;
- while (node)
- wxMenuItem *matched = (wxMenuItem*)node->Data() ;
- if (matched==item)
- break ;
- i++ ;
- node = node->Next() ;
+ wxMenu *father = item->GetSubMenu()->m_topLevelMenu ;
+ wxNode *node = father->m_menuItems.First() ;
+ int i = 0 ;
+ while (node)
+ {
+ wxMenuItem *matched = (wxMenuItem*)node->Data() ;
+ if (matched==item)
+ break ;
+ i++ ;
+ node = node->Next() ;
+ }
+ // 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) ;
- 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();
- }
+ 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 (itemMenu)
- *itemMenu = (wxMenu *) this;
- return item;
+ wxMenuItem *item = (wxMenuItem *) node->Data ();
+
+ if (item->GetId() == itemId)
+ {
+ if (itemMenu)
+ *itemMenu = (wxMenu *) this;
+ return item;
+ }
+
+ if (item->GetSubMenu())
+ {
+ wxMenuItem *ans = item->GetSubMenu()->FindItemForId (itemId, itemMenu);
+ if (ans)
+ return ans;
+ }
- // Try the window the menu was popped up from (and up
- // through the hierarchy)
- if ( !processed && GetInvokingWindow())
- processed = GetInvokingWindow()->GetEventHandler()->ProcessEvent(event);
+ // Try the window the menu was popped up from (and up through the
+ // hierarchy)
+ wxWindow *win = GetInvokingWindow();
+ if ( !processed && win )
+ processed = win->GetEventHandler()->ProcessEvent(event);
- 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;
+ 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_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;
+ 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;
- // 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.
+ // 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.
- 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;
-*/
+ 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 (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, "attempt to enable an item which doesn't exist" );
-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) ;
- 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 = check ? MF_CHECKED : MF_UNCHECKED;
+ CheckMenuItem(GetHMenuOf(itemMenu), id, MF_BYCOMMAND | flag);
+}
-// Flag=GetMenuState((HMENU)m_hMenu, Id, MF_BYCOMMAND) ;
+bool wxMenuBar::IsChecked(int id) const
+{
+ wxMenu *itemMenu = NULL;
+ wxMenuItem *item = FindItemForId(id, &itemMenu) ;
+
+ wxCHECK_MSG( item, FALSE, "wxMenuItem::IsChecked(): 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 (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) ;
- }
+ HMENU hMenu = GetHMenuOf(itemMenu);
+ UINT was_flag = ::GetMenuState(hMenu, id, MF_BYCOMMAND);
+ ::ModifyMenu(hMenu, id, MF_BYCOMMAND | MF_STRING | was_flag, id, label);
- wxMenu *itemMenu = NULL;
- wxMenuItem *item = FindItemForId(Id, &itemMenu) ;
+ wxMenu *itemMenu = NULL;
+ wxMenuItem *item = FindItemForId(id, &itemMenu) ;
+
+ wxCHECK_MSG( item, "", "wxMenuItem::GetLabel(): no such item" );
- 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) ;
- }
+ len++; // for the NUL character
+ wxString label;
+ ::GetMenuString(hMenu, id, label.GetWriteBuf(len), len, MF_BYCOMMAND);
+ label.UngetWriteBuf();
- 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 was_flag = ::GetMenuState((HMENU)m_hMenu, pos, MF_BYPOSITION);
+ if (was_flag & MF_POPUP)
+ {
+ was_flag &= 0xff ;
+ id = (UINT)::GetSubMenu((HMENU)m_hMenu, pos) ;
+ }
+ else
+ {
+ id = pos;
+ }
+
+ ::ModifyMenu((HMENU)m_hMenu, pos, MF_BYPOSITION | MF_STRING | was_flag,
+ id, label) ;
- 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((HMENU)m_hMenu, pos, label.GetWriteBuf(len), len, MF_BYCOMMAND);
+ label.UngetWriteBuf();
+
+ return label;
- 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)) {
+ m_menus[pos]->m_hMenu = m_menus[pos]->m_savehMenu;
+ m_menus[pos]->m_savehMenu = 0;
}
// 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
{
}
// 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
{
- wxStripMenuCodes ((char *)(const char *)m_titles[i], buf2);
- if (strcmp (buf1, buf2) == 0)
- return m_menus[i]->FindItem (itemString);
+ wxStripMenuCodes ((char *)(const char *)m_titles[i], buf2);
+ if (strcmp (buf1, buf2) == 0)
+ return m_menus[i]->FindItem (itemString);
- 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;
+ 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 ( 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->m_menuBarFrame;
+
+ return NULL;
-// 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.
- 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() )
+ if (!source && GetInvokingWindow())
+ source = GetInvokingWindow()->GetEventHandler();
+ if (!source)
+ source = GetEventHandler();
+ if (!source)
+ source = this;
+
+ wxNode* node = GetItems().First();
+ while (node)
- 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();
- }
+ 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();
+ }
projects / wxWidgets.git / blobdiff