compilation fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4290 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/framecmn.cpp b/src/common/framecmn.cpp
index 24819cfa3412cf26012b5a5e5663db8c468f82cb..af39670bd7bc46f3444b6af4f96b1c60795a66ee 100644 (file)
--- a/src/common/framecmn.cpp
+++ b/src/common/framecmn.cpp
@@ -41,10 +41,10 @@ void wxFrame::DoMenuUpdates()
 void wxFrame::DoMenuUpdates(wxMenu* menu, wxWindow* WXUNUSED(focusWin))
 {
   wxEvtHandler* evtHandler = GetEventHandler();
 void wxFrame::DoMenuUpdates(wxMenu* menu, wxWindow* WXUNUSED(focusWin))
 {
   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() )
     {
       wxWindowID id = item->GetId();
     if ( !item->IsSeparator() )
     {
       wxWindowID id = item->GetId();


@@ -64,6 +64,6 @@ void wxFrame::DoMenuUpdates(wxMenu* menu, wxWindow* WXUNUSED(focusWin))
       if (item->GetSubMenu())
         DoMenuUpdates(item->GetSubMenu(), (wxWindow*) NULL);
     }
       if (item->GetSubMenu())
         DoMenuUpdates(item->GetSubMenu(), (wxWindow*) NULL);
     }

-    node = node->Next();
+    node = node->GetNext();

   }
 }
   }
 }

diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp
index 35f3e15db31870265881553579115e1a872c8d8d..5cb1ff43a649b84338ae8324cc0f8696868d2154 100644 (file)
--- a/src/msw/frame.cpp
+++ b/src/msw/frame.cpp
@@ -670,7 +670,7 @@ bool wxFrame::ProcessCommand(int id)
     if ( !bar )
         return FALSE;
 
     if ( !bar )
         return FALSE;
 

-    wxMenuItem *item = bar->FindItemForId(id);
+    wxMenuItem *item = bar->FindItem(id);

     if ( item && item->IsCheckable() )
     {
         item->Toggle();
     if ( item && item->IsCheckable() )
     {
         item->Toggle();

diff --git a/src/msw/mdi.cpp b/src/msw/mdi.cpp
index 08360e1d02ec616fd84d7cbfa28f4173ab7fdeaf..39ccc4c88473228b4d44768dd1934d9cb9e30515 100644 (file)
--- a/src/msw/mdi.cpp
+++ b/src/msw/mdi.cpp
@@ -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);
         return TRUE;
     {
         ProcessCommand(id);
         return TRUE;

diff --git a/src/msw/menu.cpp b/src/msw/menu.cpp
index 139accd657c64e9f1856bd8e190c7694ae34abf7..8181a46864f75bb8c67ad50dfdda8a2de7109e58 100644 (file)
--- a/src/msw/menu.cpp
+++ b/src/msw/menu.cpp
@@ -865,7 +865,7 @@ wxMenuItem *wxMenuBar::FindItem(int id, wxMenu **itemMenu) const
     size_t count = GetMenuCount();
     for ( size_t i = 0; !item && (i < count); 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;
     }
 
     return item;