From 8c70a789581973f221cfef8affb9873e5f23ae0f Mon Sep 17 00:00:00 2001 From: Paul Cornett Date: Thu, 14 Dec 2006 07:19:21 +0000 Subject: [PATCH] make sure style is set on menubar before querying its size git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43974 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/frame.cpp | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/src/gtk/frame.cpp b/src/gtk/frame.cpp index 1c46dd333f..29c492c62d 100644 --- a/src/gtk/frame.cpp +++ b/src/gtk/frame.cpp @@ -631,20 +631,22 @@ void wxFrame::AttachMenuBar( wxMenuBar *menuBar ) void wxFrame::UpdateMenuBarSize() { - GtkRequisition req; - - req.width = 2; - req.height = 2; + m_menuBarHeight = 2; // this is called after Remove with a NULL m_frameMenuBar if ( m_frameMenuBar ) - (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(m_frameMenuBar->m_widget) )->size_request ) - (m_frameMenuBar->m_widget, &req ); - - m_menuBarHeight = req.height; + { + GtkRequisition req; + gtk_widget_ensure_style(m_frameMenuBar->m_widget); + // have to call class method directly because + // "size_request" signal is overridden by wx + GTK_WIDGET_GET_CLASS(m_frameMenuBar->m_widget)->size_request( + m_frameMenuBar->m_widget, &req); + + m_menuBarHeight = req.height; + } // resize window in OnInternalIdle - GtkUpdateSize(); } -- 2.45.2