AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

compilation fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4290 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 1999-11-02 01:31:51 +00:00
parent 600ea9da94
commit dd60b9ec1e
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/framecmn.cpp
View File

@ -41,10 +41,10 @@ void wxFrame::DoMenuUpdates()
void wxFrame::DoMenuUpdates(wxMenu* menu, wxWindow* WXUNUSED(focusWin)) void wxFrame::DoMenuUpdates(wxMenu* menu, wxWindow* WXUNUSED(focusWin))
{ {
wxEvtHandler* evtHandler = GetEventHandler(); wxEvtHandler* evtHandler = GetEventHandler();
wxNode* node = menu->GetItems().First(); wxMenuItemList::Node* node = menu->GetMenuItems().GetFirst();
while (node) while (node)
{ {
wxMenuItem* item = (wxMenuItem*) node->Data(); wxMenuItem* item = node->GetData();
if ( !item->IsSeparator() ) if ( !item->IsSeparator() )
{ {
wxWindowID id = item->GetId(); wxWindowID id = item->GetId();
@ -64,6 +64,6 @@ void wxFrame::DoMenuUpdates(wxMenu* menu, wxWindow* WXUNUSED(focusWin))
if (item->GetSubMenu()) if (item->GetSubMenu())
DoMenuUpdates(item->GetSubMenu(), (wxWindow*) NULL); DoMenuUpdates(item->GetSubMenu(), (wxWindow*) NULL);
} }
node = node->Next(); node = node->GetNext();
} }
} }

2
src/msw/frame.cpp
View File

@ -670,7 +670,7 @@ bool wxFrame::ProcessCommand(int id)
if ( !bar ) if ( !bar )
return FALSE; return FALSE;
wxMenuItem *item = bar->FindItemForId(id); wxMenuItem *item = bar->FindItem(id);
if ( item && item->IsCheckable() ) if ( item && item->IsCheckable() )
{ {
item->Toggle(); item->Toggle();

2
src/msw/mdi.cpp
View File

@ -889,7 +889,7 @@ bool wxMDIChildFrame::HandleCommand(WXWORD id, WXWORD cmd, WXHWND hwnd)
return TRUE; return TRUE;
} }
if (GetMenuBar() && GetMenuBar()->FindItemForId(id)) if (GetMenuBar() && GetMenuBar()->FindItem(id))
{ {
ProcessCommand(id); ProcessCommand(id);
return TRUE; return TRUE;

2
src/msw/menu.cpp
View File

@ -865,7 +865,7 @@ wxMenuItem *wxMenuBar::FindItem(int id, wxMenu **itemMenu) const
size_t count = GetMenuCount(); size_t count = GetMenuCount();
for ( size_t i = 0; !item && (i < count); i++ ) 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; return item;