mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-22 18:35:09 +00:00
Code Issues Releases Activity

Do not use GTK 3 if it exists but cannot be compiled.

Browse Source 
* configure.ac: Leave GTK_OBJ and term_header alone if GTK 3
exists but cannot be compiled.
* src/xmenu.c (x_menu_wait_for_event) [!USE_GTK]:
* src/xterm.c (x_error_handler) [!USE_GTK]:
Do not use GTK 3.
This commit is contained in:
Paul Eggert 2013-06-30 08:24:14 -07:00
parent e6c6c8c774
commit 8f5f35ccca
5 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2013-06-30 Paul Eggert <eggert@cs.ucla.edu>
Do not use GTK 3 if it exists but cannot be compiled.
* configure.ac: Leave GTK_OBJ and term_header alone if GTK 3
exists but cannot be compiled.
2013-06-27 Juanma Barranquero <lekktu@gmail.com>
* Makefile.in (install-arch-indep): Do not create directories passed

5
configure.ac
View File

@ -2078,6 +2078,7 @@ fi
HAVE_GTK=no
GTK_OBJ=
gtk_term_header=$term_header
check_gtk2=no
gtk3_pkg_errors=
if test "${opsys}" != "mingw32"; then
@ -2094,7 +2095,7 @@ if test "${opsys}" != "mingw32"; then
if test "$pkg_check_gtk" = "yes"; then
AC_DEFINE(HAVE_GTK3, 1, [Define to 1 if using GTK 3 or later.])
GTK_OBJ=emacsgtkfixed.o
term_header=gtkutil.h
gtk_term_header=gtkutil.h
USE_GTK_TOOLKIT="GTK3"
if test "x$ac_enable_gtk_deprecation_warnings" = x; then
GTK_CFLAGS="$GTK_CFLAGS -DGDK_DISABLE_DEPRECATION_WARNINGS"
@ -2133,6 +2134,7 @@ if test x"$pkg_check_gtk" = xyes; then
GTK_COMPILES=no
AC_CHECK_FUNCS(gtk_main, GTK_COMPILES=yes)
if test "${GTK_COMPILES}" != "yes"; then
GTK_OBJ=
if test "$USE_X_TOOLKIT" != "maybe"; then
AC_MSG_ERROR([Gtk+ wanted, but it does not compile, see config.log. Maybe some x11-devel files missing?]);
fi
@ -2140,6 +2142,7 @@ if test x"$pkg_check_gtk" = xyes; then
HAVE_GTK=yes
AC_DEFINE(USE_GTK, 1, [Define to 1 if using GTK.])
GTK_OBJ="gtkutil.o $GTK_OBJ"
term_header=$gtk_term_header
USE_X_TOOLKIT=none
if "$PKG_CONFIG" --atleast-version=2.10 gtk+-2.0; then
:

5
src/ChangeLog
View File

@ -1,5 +1,10 @@
2013-06-30 Paul Eggert <eggert@cs.ucla.edu>
Do not use GTK 3 if it exists but cannot be compiled.
* xmenu.c (x_menu_wait_for_event) [!USE_GTK]:
* xterm.c (x_error_handler) [!USE_GTK]:
Do not use GTK 3.
* intervals.c (get_local_map): Actually clip POSITION (Bug#14753).
2013-06-30 Eli Zaretskii <eliz@gnu.org>

2
src/xmenu.c
View File

@ -397,7 +397,7 @@ x_menu_wait_for_event (void *data)
else
ntp = &next_time;
#ifdef HAVE_GTK3
#if defined USE_GTK && defined HAVE_GTK3
/* Gtk3 have arrows on menus when they don't fit. When the
pointer is over an arrow, a timeout scrolls it a bit. Use
xg_select so that timeout gets triggered. */

2
src/xterm.c
View File

@ -7824,7 +7824,7 @@ static void x_error_quitter (Display *, XErrorEvent *);
static int
x_error_handler (Display *display, XErrorEvent *event)
{
#ifdef HAVE_GTK3
#if defined USE_GTK && defined HAVE_GTK3
if (event->error_code == BadMatch
&& event->request_code == X_SetInputFocus
&& event->minor_code == 0)