Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update menubar size when style changes, fixes #11310

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@62487 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2009-10-23 16:59:43 +00:00
parent 1f04196568
commit ace3235191
1 changed files with 30 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/gtk/frame.cpp
View File

@@ -78,6 +78,30 @@ static void gtk_menu_detached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *
}
}
//-----------------------------------------------------------------------------
// "size-request" from menubar
//-----------------------------------------------------------------------------
extern "C" {
static void menubar_size_request(GtkWidget* widget, GtkRequisition*, wxFrame* win)
{
g_signal_handlers_disconnect_by_func(
widget, (void*)menubar_size_request, win);
win->UpdateMenuBarSize();
}
}
//-----------------------------------------------------------------------------
// "style-set" from menubar
//-----------------------------------------------------------------------------
extern "C" {
static void menubar_style_set(GtkWidget* widget, GtkStyle*, wxFrame* win)
{
g_signal_connect(widget, "size-request",
G_CALLBACK(menubar_size_request), win);
}
}
#endif // wxUSE_MENUS_NATIVE
#if wxUSE_TOOLBAR
@@ -571,6 +595,9 @@ void wxFrame::DetachMenuBar()
if ( m_frameMenuBar )
{
g_signal_handlers_disconnect_by_func(
m_frameMenuBar->m_widget, (void*)menubar_style_set, this);
m_frameMenuBar->UnsetInvokingWindow( this );
if (m_frameMenuBar->GetWindowStyle() & wxMB_DOCKABLE)
@@ -621,6 +648,9 @@ void wxFrame::AttachMenuBar( wxMenuBar *menuBar )
gtk_widget_show( m_frameMenuBar->m_widget );
UpdateMenuBarSize();
g_signal_connect(menuBar->m_widget, "style-set",
G_CALLBACK(menubar_style_set), this);
}
else
{