rpms/wxGTK/F-10 wxGTK-2.8.10-menubar-height.patch, NONE, 1.1 wxGTK.spec, 1.45, 1.46

[Dan Horák]

Author: sharkcz

Update of /cvs/pkgs/rpms/wxGTK/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21213

Modified Files:
	wxGTK.spec 
Added Files:
	wxGTK-2.8.10-menubar-height.patch 
Log Message:
* 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)


wxGTK-2.8.10-menubar-height.patch:
 frame.cpp |   30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

--- NEW FILE wxGTK-2.8.10-menubar-height.patch ---
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
     {


Index: wxGTK.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wxGTK/F-10/wxGTK.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- wxGTK.spec	16 Oct 2009 10:20:36 -0000	1.45
+++ wxGTK.spec	25 Oct 2009 09:48:52 -0000	1.46
@@ -6,7 +6,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
@@ -20,6 +20,8 @@ Source0:        http://dl.sf.net/wxwindo
 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)
 
@@ -131,6 +133,7 @@ libraries or the X Window System.
 %setup -q
 %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
 
@@ -276,6 +279,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)