added animate contrib

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

diff --git a/src/common/framecmn.cpp b/src/common/framecmn.cpp
index f36f762caecea3ee97242d62bee8caed437b567e..7e64059805190a6de2d7b0c20da236d4018bc723 100644 (file)
--- a/src/common/framecmn.cpp
+++ b/src/common/framecmn.cpp
@@ -4,7 +4,7 @@
 // Author:      Julian Smart, Vadim Zeitlin
 // Created:     01/02/97
 // Id:          $Id$
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Copyright:   (c) 1998 Robert Roebling and Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -46,7 +46,12 @@
 // ----------------------------------------------------------------------------
 
 BEGIN_EVENT_TABLE(wxFrameBase, wxTopLevelWindow)
+#if wxUSE_MENUS && wxUSE_IDLEMENUUPDATES
     EVT_IDLE(wxFrameBase::OnIdle)
+#endif
+#if wxUSE_MENUS && !wxUSE_IDLEMENUUPDATES
+    EVT_MENU_OPEN(wxFrameBase::OnMenuOpen)
+#endif
     EVT_MENU_HIGHLIGHT_ALL(wxFrameBase::OnMenuHighlight)
 END_EVENT_TABLE()
 
@@ -199,7 +204,8 @@ bool wxFrameBase::ProcessCommand(int id)
         }
     }
 
-    return GetEventHandler()->ProcessEvent(commandEvent);
+    GetEventHandler()->ProcessEvent(commandEvent);
+    return TRUE;
 #else // !wxUSE_MENUS
     return FALSE;
 #endif // wxUSE_MENUS/!wxUSE_MENUS
@@ -218,9 +224,17 @@ void wxFrameBase::OnMenuHighlight(wxMenuEvent& event)
 
 void wxFrameBase::OnIdle(wxIdleEvent& WXUNUSED(event) )
 {
-#if wxUSE_MENUS
+#if wxUSE_MENUS && wxUSE_IDLEMENUUPDATES
+    if (wxUpdateUIEvent::CanUpdate())
+        DoMenuUpdates();
+#endif
+}
+
+void wxFrameBase::OnMenuOpen(wxMenuEvent& WXUNUSED(event))
+{
+#if wxUSE_MENUS && !wxUSE_IDLEMENUUPDATES
     DoMenuUpdates();
-#endif // wxUSE_MENUS
+#endif
 }
 
 // ----------------------------------------------------------------------------
@@ -288,18 +302,6 @@ void wxFrameBase::PopStatusText(int number)
     m_frameStatusBar->PopStatusText(number);
 }
 
-void wxFrameBase::DoGiveHelp(const wxString& text, bool show)
-{
-#if wxUSE_STATUSBAR
-    if ( m_statusBarPane < 0 ) return;
-    wxStatusBar* statbar = GetStatusBar();
-    if ( !statbar ) return;
-
-    wxString help = show ? text : wxString();
-    statbar->SetStatusText( help, m_statusBarPane );
-#endif // wxUSE_STATUSBAR
-}
-
 bool wxFrameBase::ShowMenuHelp(wxStatusBar *WXUNUSED(statbar), int menuId)
 {
 #if wxUSE_MENUS
@@ -330,6 +332,19 @@ bool wxFrameBase::ShowMenuHelp(wxStatusBar *WXUNUSED(statbar), int menuId)
 
 #endif // wxUSE_STATUSBAR
 
+void wxFrameBase::DoGiveHelp(const wxString& text, bool show)
+{
+#if wxUSE_STATUSBAR
+    if ( m_statusBarPane < 0 ) return;
+    wxStatusBar* statbar = GetStatusBar();
+    if ( !statbar ) return;
+
+    wxString help = show ? text : wxString();
+    statbar->SetStatusText( help, m_statusBarPane );
+#endif // wxUSE_STATUSBAR
+}
+
+
 // ----------------------------------------------------------------------------
 // toolbar stuff
 // ----------------------------------------------------------------------------
@@ -410,7 +425,7 @@ void wxFrameBase::DoMenuUpdates(wxMenu* menu, wxWindow* focusWin)
             }
 
             if (item->GetSubMenu())
-                DoMenuUpdates(item->GetSubMenu(), (wxWindow*) NULL);
+                DoMenuUpdates(item->GetSubMenu(), focusWin);
         }
         node = node->GetNext();
     }