wxMotif compilation fixes for wxDataObject and PROCESS_EVENTS (wxSocket)

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

diff --git a/src/common/framecmn.cpp b/src/common/framecmn.cpp
index 4acd32c428b78f7964043ac88c7528cf76761350..24819cfa3412cf26012b5a5e5663db8c468f82cb 100644 (file)
--- a/src/common/framecmn.cpp
+++ b/src/common/framecmn.cpp
@@ -8,27 +8,39 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+#pragma hdrstop
+#endif
+
 #include "wx/frame.h"
+#include "wx/menu.h"
+#include "wx/menuitem.h"
 
 void wxFrame::OnIdle(wxIdleEvent& WXUNUSED(event) )
 {
-  DoMenuUpdates();
+    DoMenuUpdates();
 }
 
 // update all menus
 void wxFrame::DoMenuUpdates()
 {
-  wxMenuBar* bar = GetMenuBar();
-  if ( bar != NULL ) {
-    int nCount = bar->GetMenuCount();
-    for (int n = 0; n < nCount; n++)
-      DoMenuUpdates(bar->GetMenu(n));
-  }
+    wxMenuBar* bar = GetMenuBar();
+
+    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
-void wxFrame::DoMenuUpdates(wxMenu* menu)
+void wxFrame::DoMenuUpdates(wxMenu* menu, wxWindow* WXUNUSED(focusWin))
 {
+  wxEvtHandler* evtHandler = GetEventHandler();
   wxNode* node = menu->GetItems().First();
   while (node)
   {
@@ -39,7 +51,7 @@ void wxFrame::DoMenuUpdates(wxMenu* menu)
       wxUpdateUIEvent event(id);
       event.SetEventObject( this );
 
-      if (GetEventHandler()->ProcessEvent(event))
+      if (evtHandler->ProcessEvent(event))
       {
         if (event.GetSetText())
           menu->SetLabel(id, event.GetText());
@@ -50,7 +62,7 @@ void wxFrame::DoMenuUpdates(wxMenu* menu)
       }
 
       if (item->GetSubMenu())
-        DoMenuUpdates(item->GetSubMenu());
+        DoMenuUpdates(item->GetSubMenu(), (wxWindow*) NULL);
     }
     node = node->Next();
   }