Column name IS_DEVELOPER in index was shortened to IS_DEV to match the column name...

[wxWidgets.git] / src / common / framecmn.cpp

diff --git a/src/common/framecmn.cpp b/src/common/framecmn.cpp
index 163b00a160bcd53898ace9095e5e70f9d6f7af60..af39670bd7bc46f3444b6af4f96b1c60795a66ee 100644 (file)
--- a/src/common/framecmn.cpp
+++ b/src/common/framecmn.cpp
@@ -19,36 +19,32 @@
 #include "wx/menu.h"
 #include "wx/menuitem.h"
 
 #include "wx/menu.h"
 #include "wx/menuitem.h"
 

-#ifndef __WXGTK__

 void wxFrame::OnIdle(wxIdleEvent& WXUNUSED(event) )
 {
 void wxFrame::OnIdle(wxIdleEvent& WXUNUSED(event) )
 {

-  DoMenuUpdates();
+    DoMenuUpdates();

 }
 }

-#endif

 
 // update all menus
 void wxFrame::DoMenuUpdates()
 {
 
 // update all menus
 void wxFrame::DoMenuUpdates()
 {

-  wxMenuBar* bar = GetMenuBar();
-
-  // Process events starting with the window with the focus, if any.
-  wxWindow* focusWin = wxFindFocusDescendant(this);
+    wxMenuBar* bar = GetMenuBar();

 
 

-  if ( bar != NULL ) {
-    int nCount = bar->GetMenuCount();
-    for (int n = 0; n < nCount; n++)
-      DoMenuUpdates(bar->GetMenu(n), focusWin);
-  }
+    if ( bar != NULL ) 
+    {
+        int nCount = bar->GetMenuCount();
+        for (int n = 0; n < nCount; n++)
+            DoMenuUpdates(bar->GetMenu(n), (wxWindow*) NULL);
+    }

 }
 
 // update a menu and all submenus recursively
 }
 
 // update a menu and all submenus recursively

-void wxFrame::DoMenuUpdates(wxMenu* menu, wxWindow* focusWin)
+void wxFrame::DoMenuUpdates(wxMenu* menu, wxWindow* WXUNUSED(focusWin))

 {
 {

-  wxEvtHandler* evtHandler = focusWin ? focusWin->GetEventHandler() : GetEventHandler();
-  wxNode* node = menu->GetItems().First();
+  wxEvtHandler* evtHandler = GetEventHandler();
+  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();


@@ -66,8 +62,8 @@ void wxFrame::DoMenuUpdates(wxMenu* menu, wxWindow* focusWin)
       }
 
       if (item->GetSubMenu())
       }
 
       if (item->GetSubMenu())

-        DoMenuUpdates(item->GetSubMenu(), focusWin);
+        DoMenuUpdates(item->GetSubMenu(), (wxWindow*) NULL);

     }
     }

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

   }
 }
   }
 }