rpms/wxGTK/F-12 wxGTK-2.8.10-menubar-height.patch, NONE, 1.1 wxGTK.spec, 1.49, 1.50
Dan Horák
sharkcz at fedoraproject.org
Sun Oct 25 09:38:14 UTC 2009
- Previous message (by thread): rpms/glom/devel .cvsignore, 1.27, 1.28 glom.spec, 1.38, 1.39 sources, 1.27, 1.28
- Next message (by thread): rpms/wxGTK/F-11 wxGTK-2.8.10-menubar-height.patch, NONE, 1.1 wxGTK.spec, 1.47, 1.48
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: sharkcz
Update of /cvs/pkgs/rpms/wxGTK/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18993
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-6
- 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-12/wxGTK.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- wxGTK.spec 16 Oct 2009 10:17:00 -0000 1.49
+++ wxGTK.spec 25 Oct 2009 09:38:14 -0000 1.50
@@ -4,7 +4,7 @@
Name: wxGTK
Version: 2.8.10
-Release: 5%{?dist}
+Release: 6%{?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 @@ Patch0: %{name}-2.8.10-gsocket.p
Patch1: %{name}-2.8.10-CVE-2009-2369.patch
# http://trac.wxwidgets.org/ticket/11315
Patch2: %{name}-2.8.10-wxTimer-fix.patch
+# http://trac.wxwidgets.org/ticket/11310
+Patch3: %{name}-2.8.10-menubar-height.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -104,6 +106,7 @@ libraries or the X Window System.
%patch0 -p1 -b .gsocket
%patch1 -p0 -b .CVE-2009-2369
%patch2 -p0 -b .wxTimer-fix
+%patch3 -p0 -b .menubar-height
sed -i -e 's|/usr/lib\b|%{_libdir}|' wx-config.in configure
@@ -260,7 +263,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog
-* Fri Oct 16 2009 Dan Horák <dan[at]danny.cz> - 2.8.10-5
+* Sun Oct 25 2009 Dan Horák <dan[at]danny.cz> - 2.8.10-6
+- 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-5
- add fix for excessive CPU usage (#494425)
* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.8.10-4
- Previous message (by thread): rpms/glom/devel .cvsignore, 1.27, 1.28 glom.spec, 1.38, 1.39 sources, 1.27, 1.28
- Next message (by thread): rpms/wxGTK/F-11 wxGTK-2.8.10-menubar-height.patch, NONE, 1.1 wxGTK.spec, 1.47, 1.48
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list