X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/385e8575dd1f9219fb0e3f7fa26ffe4c24d2fdbb..4a699e3a59b19c21b6faae714b56cac5a75df2e2:/src/gtk/mdi.cpp diff --git a/src/gtk/mdi.cpp b/src/gtk/mdi.cpp index 760a4ac4ef..b1242254bc 100644 --- a/src/gtk/mdi.cpp +++ b/src/gtk/mdi.cpp @@ -294,6 +294,12 @@ wxMDIChildFrame::~wxMDIChildFrame() gtk_widget_queue_draw(m_parent->m_widget); } +void wxMDIChildFrame::GTKHandleRealized() +{ + // since m_widget is not a GtkWindow, must bypass wxTopLevelWindowGTK + wxTopLevelWindowBase::GTKHandleRealized(); +} + void wxMDIChildFrame::SetMenuBar( wxMenuBar *menu_bar ) { wxASSERT_MSG( m_menuBar == NULL, "Only one menubar allowed" ); @@ -310,14 +316,6 @@ void wxMDIChildFrame::SetMenuBar( wxMenuBar *menu_bar ) m_menuBar->Show(false); gtk_box_pack_start(GTK_BOX(mdi_frame->m_mainWidget), m_menuBar->m_widget, false, false, 0); gtk_box_reorder_child(GTK_BOX(mdi_frame->m_mainWidget), m_menuBar->m_widget, 0); - - gulong handler_id = g_signal_handler_find( - m_menuBar->m_widget, - GSignalMatchType(G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_DATA), - g_signal_lookup("size_request", GTK_TYPE_WIDGET), - 0, NULL, NULL, m_menuBar); - if (handler_id != 0) - g_signal_handler_disconnect(m_menuBar->m_widget, handler_id); gtk_widget_set_size_request(m_menuBar->m_widget, -1, -1); } }