* bug#4122: Quick fix
@ 2009-08-31 0:28 Robin Green
2009-09-01 10:43 ` Jan D.
0 siblings, 1 reply; 2+ messages in thread
From: Robin Green @ 2009-08-31 0:28 UTC (permalink / raw
To: 4122
[-- Attachment #1: Type: text/plain, Size: 494 bytes --]
The attached patch against Emacs 23.1.1 fixes this bug for me. The
patch can be used by emacs users and Linux distributors - who might
need to lower the required GTK version. However, the patch would
probably need to be modified before being checked in to emacs CVS,
because it specifies a dependency on a very recent version of GTK - a
more suitable patch for emacs CVS would use the C preprocessor to
perform the old behaviour for old GTK versions, and the new behaviour
for new GTK versions.
[-- Attachment #2: emacs-gtk.patch --]
[-- Type: text/x-patch, Size: 1515 bytes --]
--- configure.in.orig 2009-08-31 00:18:44.000000000 +0100
+++ configure.in 2009-08-31 00:18:47.000000000 +0100
@@ -1514,7 +1514,7 @@
HAVE_GTK=no
if test "${with_gtk}" = "yes" || test "$USE_X_TOOLKIT" = "maybe"; then
GLIB_REQUIRED=2.6
- GTK_REQUIRED=2.6
+ GTK_REQUIRED=2.17.9
GTK_MODULES="gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED"
dnl Checks for libraries.
--- src/xfns.c.orig 2009-08-31 00:03:02.000000000 +0100
+++ src/xfns.c 2009-08-31 00:21:39.000000000 +0100
@@ -468,8 +468,10 @@
if (!FRAME_X_P (f) || FRAME_X_DISPLAY_INFO (f) != dpyinfo)
continue;
x = f->output_data.x;
- /* Match if the window is this frame's menubar. */
#ifdef USE_GTK
+ /* Match if the window is this frame's window (button presses are no longer
+ caught by the menubar) or a menu in the menubar.
+ */
if (x->menubar_widget)
{
GtkWidget *gwdesc = xg_win_to_widget (dpyinfo->display, wdesc);
@@ -477,13 +479,14 @@
BLOCK_INPUT;
if (gwdesc != 0
- && (gwdesc == x->menubar_widget
+ && (gwdesc == gtk_widget_get_parent (gtk_widget_get_parent (x->menubar_widget))
|| gtk_widget_get_parent (gwdesc) == x->menubar_widget))
found = 1;
UNBLOCK_INPUT;
if (found) return f;
}
#else
+ /* Match if the window is in this frame's menubar */
if (x->menubar_widget
&& lw_window_is_in_menubar (wdesc, x->menubar_widget))
return f;
^ permalink raw reply [flat|nested] 2+ messages in thread
* bug#4122: Quick fix
2009-08-31 0:28 bug#4122: Quick fix Robin Green
@ 2009-09-01 10:43 ` Jan D.
0 siblings, 0 replies; 2+ messages in thread
From: Jan D. @ 2009-09-01 10:43 UTC (permalink / raw
To: Robin Green, 4122@emacsbugs.donarmstrong.com
Cc: 4122@emacsbugs.donarmstrong.com
The patch makes Gtk+ 2.17 mandatory for Emacs. This is obviously not
acceptable. A better patch will be installed soon. Be patient.
Jan D.
31 aug 2009 kl. 02.28 skrev Robin Green <greenrd@greenrd.org>:
> The attached patch against Emacs 23.1.1 fixes this bug for me. The
> patch can be used by emacs users and Linux distributors - who might
> need to lower the required GTK version. However, the patch would
> probably need to be modified before being checked in to emacs CVS,
> because it specifies a dependency on a very recent version of GTK - a
> more suitable patch for emacs CVS would use the C preprocessor to
> perform the old behaviour for old GTK versions, and the new behaviour
> for new GTK versions.
> <emacs-gtk.patch>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-09-01 10:43 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-08-31 0:28 bug#4122: Quick fix Robin Green
2009-09-01 10:43 ` Jan D.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.