From cb8190ca57d611622ec4eced50d9697bdaa1650d Mon Sep 17 00:00:00 2001
From: Dan Horák <sharkcz@fedoraproject.org>
Date: Oct 25 2009 09:45:59 +0000
Subject: - add fix for wrong menubar height when using larger system font (#528376)


---

diff --git a/wxGTK-2.8.10-menubar-height.patch b/wxGTK-2.8.10-menubar-height.patch
new file mode 100644
index 0000000..4d56eaf
--- /dev/null
+++ b/wxGTK-2.8.10-menubar-height.patch
@@ -0,0 +1,55 @@
+Index: src/gtk/frame.cpp
+===================================================================
+--- src/gtk/frame.cpp	(revision 62486)
++++ src/gtk/frame.cpp	(revision 62487)
+@@ -78,6 +78,30 @@
+ }
+ }
+ 
++//-----------------------------------------------------------------------------
++// "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 @@
+ 
+     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 @@
+         gtk_widget_show( m_frameMenuBar->m_widget );
+ 
+         UpdateMenuBarSize();
++
++        g_signal_connect(menuBar->m_widget, "style-set",
++            G_CALLBACK(menubar_style_set), this);
+     }
+     else
+     {
diff --git a/wxGTK.spec b/wxGTK.spec
index 7eaaa8a..86278d8 100644
--- a/wxGTK.spec
+++ b/wxGTK.spec
@@ -4,7 +4,7 @@
 
 Name:           wxGTK
 Version:        2.8.10
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        GTK2 port of the wxWidgets GUI library
 # The wxWindows licence is the LGPL with a specific exemption allowing
 # distribution of derived binaries under any terms. (This will eventually
@@ -18,6 +18,8 @@ Source0:        http://dl.sf.net/wxwindows/%{name}-%{version}.tar.bz2
 Patch0:         %{name}-2.8.10-CVE-2009-2369.patch
 # http://trac.wxwidgets.org/ticket/11315
 Patch1:         %{name}-2.8.10-wxTimer-fix.patch
+# http://trac.wxwidgets.org/ticket/11310 
+Patch2:         %{name}-2.8.10-menubar-height.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -101,6 +103,7 @@ libraries or the X Window System.
 %setup -q -n %{name}-%{version}
 %patch0 -p0 -b .CVE-2009-2369
 %patch1 -p0 -b .wxTimer-fix
+%patch2 -p0 -b .menubar-height
 
 sed -i -e 's|/usr/lib\b|%{_libdir}|' wx-config.in configure
 
@@ -253,6 +256,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Oct 25 2009 Dan Horák <dan[at]danny.cz> - 2.8.10-4
+- add fix for wrong menubar height when using larger system font (#528376)
+
 * Fri Oct 16 2009 Dan Horák <dan[at]danny.cz> - 2.8.10-3
 - add fix for excessive CPU usage (#494425)