X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e41a1b1cbb37808d2bbd532b0d2a4bd49924c81a..7d6a4d96961eac84d05db8bb24c64d39003f6e54:/src/gtk/frame.cpp diff --git a/src/gtk/frame.cpp b/src/gtk/frame.cpp index dfec0ddbaa..a44b4bf9ec 100644 --- a/src/gtk/frame.cpp +++ b/src/gtk/frame.cpp @@ -20,12 +20,18 @@ #include +#if wxUSE_LIBHILDON + #include +#endif // wxUSE_LIBHILDON + +#if wxUSE_LIBHILDON2 + #include +#endif // wxUSE_LIBHILDON2 + // ---------------------------------------------------------------------------- // event tables // ---------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxTopLevelWindow) - // ============================================================================ // implementation // ============================================================================ @@ -52,7 +58,8 @@ bool wxFrame::Create( wxWindow *parent, wxFrame::~wxFrame() { - m_isBeingDeleted = true; + SendDestroyEvent(); + DeleteAllBars(); } @@ -74,7 +81,9 @@ void wxFrame::DoGetClientSize( int *width, int *height ) const { GtkRequisition req; gtk_widget_size_request(m_frameMenuBar->m_widget, &req); +#if !wxUSE_LIBHILDON && !wxUSE_LIBHILDON2 *height -= req.height; +#endif } #endif // wxUSE_MENUS_NATIVE @@ -110,7 +119,7 @@ void wxFrame::DoGetClientSize( int *width, int *height ) const *height = 0; } -#if wxUSE_MENUS +#if wxUSE_MENUS && wxUSE_ACCEL // Helper for wxCreateAcceleratorTableForMenuBar static void wxAddAccelerators(wxList& accelEntries, wxMenu* menu) { @@ -158,7 +167,7 @@ static wxAcceleratorTable wxCreateAcceleratorTableForMenuBar(wxMenuBar* menuBar) wxAcceleratorEntry* entry = (wxAcceleratorEntry*) accelEntries.Item(i)->GetData(); entries[i] = (*entry); delete entry; - + } wxAcceleratorTable table(n, entries); @@ -166,21 +175,21 @@ static wxAcceleratorTable wxCreateAcceleratorTableForMenuBar(wxMenuBar* menuBar) return table; } -#endif +#endif // wxUSE_MENUS && wxUSE_ACCEL bool wxFrame::ShowFullScreen(bool show, long style) { if (!wxFrameBase::ShowFullScreen(show, style)) return false; -#if wxUSE_MENUS +#if wxUSE_MENUS && wxUSE_ACCEL if (show && GetMenuBar()) { wxAcceleratorTable table(wxCreateAcceleratorTableForMenuBar(GetMenuBar())); if (table.IsOk()) SetAcceleratorTable(table); } -#endif +#endif // wxUSE_MENUS && wxUSE_ACCEL wxWindow* const bar[] = { #if wxUSE_MENUS @@ -226,32 +235,24 @@ bool wxFrame::ShowFullScreen(bool show, long style) 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 (m_frameToolBar) m_frameToolBar->OnInternalIdle(); + if (m_frameToolBar && m_frameToolBar->SendIdleEvents(event)) + needMore = true; #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 + + return needMore; } // ---------------------------------------------------------------------------- @@ -267,11 +268,13 @@ void wxFrame::DetachMenuBar() if ( m_frameMenuBar ) { - m_frameMenuBar->UnsetInvokingWindow( this ); - - gtk_widget_ref( m_frameMenuBar->m_widget ); +#if wxUSE_LIBHILDON || wxUSE_LIBHILDON2 + hildon_window_set_menu(HILDON_WINDOW(m_widget), NULL); +#else // !wxUSE_LIBHILDON && !wxUSE_LIBHILDON2 + 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 } wxFrameBase::DetachMenuBar(); @@ -286,8 +289,10 @@ void wxFrame::AttachMenuBar( wxMenuBar *menuBar ) if (m_frameMenuBar) { - m_frameMenuBar->SetInvokingWindow( this ); - +#if 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->SetParent(this); // menubar goes into top of vbox (m_mainWidget) @@ -295,20 +300,11 @@ void wxFrame::AttachMenuBar( wxMenuBar *menuBar ) GTK_BOX(m_mainWidget), menuBar->m_widget, false, false, 0); gtk_box_reorder_child(GTK_BOX(m_mainWidget), menuBar->m_widget, 0); - // disconnect wxWindowGTK "size_request" handler, - // it interferes with sizing of detached GtkHandleBox - gulong handler_id = g_signal_handler_find( - menuBar->m_widget, - GSignalMatchType(G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_DATA), - g_signal_lookup("size_request", GTK_TYPE_WIDGET), - 0, NULL, NULL, menuBar); - if (handler_id != 0) - g_signal_handler_disconnect(menuBar->m_widget, handler_id); - // reset size request to allow native sizing to work gtk_widget_set_size_request(menuBar->m_widget, -1, -1); gtk_widget_show( m_frameMenuBar->m_widget ); +#endif // wxUSE_LIBHILDON || wxUSE_LIBHILDON2/!wxUSE_LIBHILDON && !wxUSE_LIBHILDON2 } // make sure next size_allocate causes a wxSizeEvent m_oldClientWidth = 0; @@ -326,7 +322,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. - GtkWidget* hbox = m_wxwindow->parent; + GtkWidget* hbox = gtk_widget_get_parent(m_wxwindow); if (!GTK_IS_HBOX(hbox)) { hbox = gtk_hbox_new(false, 0); @@ -358,17 +354,6 @@ void wxFrame::SetToolBar(wxToolBar *toolbar) gtk_box_reorder_child( GTK_BOX(m_mainWidget), toolbar->m_widget, pos); } - - // disconnect wxWindowGTK "size_request" handler, - // it interferes with sizing of detached GtkHandleBox - gulong handler_id = g_signal_handler_find( - toolbar->m_widget, - GSignalMatchType(G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_DATA), - g_signal_lookup("size_request", GTK_TYPE_WIDGET), - 0, NULL, NULL, toolbar); - if (handler_id != 0) - g_signal_handler_disconnect(toolbar->m_widget, handler_id); - // reset size request to allow native sizing to work gtk_widget_set_size_request(toolbar->m_widget, -1, -1); } @@ -391,6 +376,13 @@ void wxFrame::SetStatusBar(wxStatusBar *statbar) statbar->m_widget, false, false, 0, GTK_PACK_END); // make sure next size_allocate on statusbar causes a size event statbar->m_oldClientWidth = 0; + int h = -1; + if (statbar->m_wxwindow) + { + // statusbar is not a native widget, need to set height request + h = statbar->m_height; + } + gtk_widget_set_size_request(statbar->m_widget, -1, h); } // make sure next size_allocate causes a wxSizeEvent m_oldClientWidth = 0;