- add fix for wrong menubar height when using larger system font (#528376)
This commit is contained in:
parent
1786169172
commit
48e18a9cca
|
@ -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
|
||||||
|
{
|
|
@ -20,6 +20,8 @@ Patch0: %{name}-2.8.10-gsocket.patch
|
||||||
Patch1: %{name}-2.8.10-CVE-2009-2369.patch
|
Patch1: %{name}-2.8.10-CVE-2009-2369.patch
|
||||||
# http://trac.wxwidgets.org/ticket/11315
|
# http://trac.wxwidgets.org/ticket/11315
|
||||||
Patch2: %{name}-2.8.10-wxTimer-fix.patch
|
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)
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
|
|
||||||
|
@ -104,6 +106,7 @@ libraries or the X Window System.
|
||||||
%patch0 -p1 -b .gsocket
|
%patch0 -p1 -b .gsocket
|
||||||
%patch1 -p0 -b .CVE-2009-2369
|
%patch1 -p0 -b .CVE-2009-2369
|
||||||
%patch2 -p0 -b .wxTimer-fix
|
%patch2 -p0 -b .wxTimer-fix
|
||||||
|
%patch3 -p0 -b .menubar-height
|
||||||
|
|
||||||
sed -i -e 's|/usr/lib\b|%{_libdir}|' wx-config.in configure
|
sed -i -e 's|/usr/lib\b|%{_libdir}|' wx-config.in configure
|
||||||
|
|
||||||
|
@ -260,6 +263,9 @@ rm -rf $RPM_BUILD_ROOT
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* 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
|
* Fri Oct 16 2009 Dan Horák <dan[at]danny.cz> - 2.8.10-5
|
||||||
- add fix for excessive CPU usage (#494425)
|
- add fix for excessive CPU usage (#494425)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue