Fix typo in last commit

[wxWidgets.git] / src / gtk / frame.cpp

diff --git a/src/gtk/frame.cpp b/src/gtk/frame.cpp
index bcb72003feaa54ef3b958c0f7f2cc09a2d2914e5..37272e7b0bffa32ae5f234c36606b282236ba049 100644 (file)
--- a/src/gtk/frame.cpp
+++ b/src/gtk/frame.cpp
@@ -32,8 +32,6 @@
 // event tables
 // ----------------------------------------------------------------------------
 
 // event tables
 // ----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxTopLevelWindow)
-

 // ============================================================================
 // implementation
 // ============================================================================
 // ============================================================================
 // implementation
 // ============================================================================


@@ -237,32 +235,24 @@ bool wxFrame::ShowFullScreen(bool show, long style)
     return true;
 }
 
     return true;
 }
 

-void wxFrame::OnInternalIdle()
+bool wxFrame::SendIdleEvents(wxIdleEvent& event)

 {
 {

-    wxFrameBase::OnInternalIdle();
+    bool needMore = wxFrameBase::SendIdleEvents(event);

 
 

-#if wxUSE_MENUS_NATIVE
-    if (m_frameMenuBar) m_frameMenuBar->OnInternalIdle();
-#endif // wxUSE_MENUS_NATIVE
+#if wxUSE_MENUS
+    if (m_frameMenuBar && m_frameMenuBar->SendIdleEvents(event))
+        needMore = true;
+#endif

 #if wxUSE_TOOLBAR
 #if wxUSE_TOOLBAR

-    if (m_frameToolBar) m_frameToolBar->OnInternalIdle();
+    if (m_frameToolBar && m_frameToolBar->SendIdleEvents(event))
+        needMore = true;

 #endif
 #if wxUSE_STATUSBAR
 #endif
 #if wxUSE_STATUSBAR

-    if (m_frameStatusBar)
-    {
-        m_frameStatusBar->OnInternalIdle();
-
-        // There may be controls in the status bar that
-        // need to be updated
-        for ( wxWindowList::compatibility_iterator node = m_frameStatusBar->GetChildren().GetFirst();
-          node;
-          node = node->GetNext() )
-        {
-            wxWindow *child = node->GetData();
-            child->OnInternalIdle();
-        }
-    }
+    if (m_frameStatusBar && m_frameStatusBar->SendIdleEvents(event))
+        needMore = true;

 #endif
 #endif

+
+    return needMore;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -281,9 +271,7 @@ void wxFrame::DetachMenuBar()
 #if wxUSE_LIBHILDON || wxUSE_LIBHILDON2
         hildon_window_set_menu(HILDON_WINDOW(m_widget), NULL);
 #else // !wxUSE_LIBHILDON && !wxUSE_LIBHILDON2
 #if wxUSE_LIBHILDON || wxUSE_LIBHILDON2
         hildon_window_set_menu(HILDON_WINDOW(m_widget), NULL);
 #else // !wxUSE_LIBHILDON && !wxUSE_LIBHILDON2

-        m_frameMenuBar->UnsetInvokingWindow( this );
-
-        gtk_widget_ref( m_frameMenuBar->m_widget );
+        g_object_ref( m_frameMenuBar->m_widget );

 
         gtk_container_remove( GTK_CONTAINER(m_mainWidget), m_frameMenuBar->m_widget );
 #endif // wxUSE_LIBHILDON || wxUSE_LIBHILDON2 /!wxUSE_LIBHILDON && !wxUSE_LIBHILDON2
 
         gtk_container_remove( GTK_CONTAINER(m_mainWidget), m_frameMenuBar->m_widget );
 #endif // wxUSE_LIBHILDON || wxUSE_LIBHILDON2 /!wxUSE_LIBHILDON && !wxUSE_LIBHILDON2


@@ -305,8 +293,6 @@ void wxFrame::AttachMenuBar( wxMenuBar *menuBar )
         hildon_window_set_menu(HILDON_WINDOW(m_widget),
                                GTK_MENU(m_frameMenuBar->m_menubar));
 #else // !wxUSE_LIBHILDON && !wxUSE_LIBHILDON2
         hildon_window_set_menu(HILDON_WINDOW(m_widget),
                                GTK_MENU(m_frameMenuBar->m_menubar));
 #else // !wxUSE_LIBHILDON && !wxUSE_LIBHILDON2

-        m_frameMenuBar->SetInvokingWindow( this );
-

         m_frameMenuBar->SetParent(this);
 
         // menubar goes into top of vbox (m_mainWidget)
         m_frameMenuBar->SetParent(this);
 
         // menubar goes into top of vbox (m_mainWidget)


@@ -346,7 +332,7 @@ void wxFrame::SetToolBar(wxToolBar *toolbar)
         {
             // Vertical toolbar and m_wxwindow go into an hbox, inside the
             // vbox (m_mainWidget). hbox is created on demand.
         {
             // Vertical toolbar and m_wxwindow go into an hbox, inside the
             // vbox (m_mainWidget). hbox is created on demand.

-            GtkWidget* hbox = m_wxwindow->parent;
+            GtkWidget* hbox = gtk_widget_get_parent(m_wxwindow);

             if (!GTK_IS_HBOX(hbox))
             {
                 hbox = gtk_hbox_new(false, 0);
             if (!GTK_IS_HBOX(hbox))
             {
                 hbox = gtk_hbox_new(false, 0);