[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r112533: * xterm.h (GTK_PREREQ): Remo
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r112533: * xterm.h (GTK_PREREQ): Remove, replacing with GTK_CHECK_VERSION. |
Date: |
Thu, 09 May 2013 07:49:56 -0700 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 112533
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Thu 2013-05-09 07:49:56 -0700
message:
* xterm.h (GTK_PREREQ): Remove, replacing with GTK_CHECK_VERSION.
(GTK_CHECK_VERSION): New macro, if not already defined.
All uses of GTK_PREREQ, GTK_MAJOR_VERSION, etc.
replaced by GTK_CHECK_VERSION.
modified:
src/ChangeLog
src/gtkutil.c
src/xfns.c
src/xterm.c
src/xterm.h
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2013-05-08 22:56:08 +0000
+++ b/src/ChangeLog 2013-05-09 14:49:56 +0000
@@ -1,3 +1,10 @@
+2013-05-09 Paul Eggert <address@hidden>
+
+ * xterm.h (GTK_PREREQ): Remove, replacing with GTK_CHECK_VERSION.
+ (GTK_CHECK_VERSION): New macro, if not already defined.
+ All uses of GTK_PREREQ, GTK_MAJOR_VERSION, etc.
+ replaced by GTK_CHECK_VERSION.
+
2013-05-08 Paul Eggert <address@hidden>
* xterm.h (GTK_PREREQ): New macro.
=== modified file 'src/gtkutil.c'
--- a/src/gtkutil.c 2013-05-08 22:56:08 +0000
+++ b/src/gtkutil.c 2013-05-09 14:49:56 +0000
@@ -70,13 +70,13 @@
#define gtk_adjustment_get_step_increment(w) ((w)->step_increment)
#define gtk_adjustment_set_step_increment(w, s) ((w)->step_increment = (s))
#endif
-#if GTK_PREREQ (2, 12)
+#if GTK_CHECK_VERSION (2, 12, 0)
#define remove_submenu(w) gtk_menu_item_set_submenu ((w), NULL)
#else
#define remove_submenu(w) gtk_menu_item_remove_submenu ((w))
#endif
-#if GTK_PREREQ (3, 2)
+#if GTK_CHECK_VERSION (3, 2, 0)
#define USE_NEW_GTK_FONT_CHOOSER 1
#else
#define USE_NEW_GTK_FONT_CHOOSER 0
@@ -202,7 +202,7 @@
gdpy_def = gdpy_new;
}
-#if GTK_MAJOR_VERSION == 2 && GTK_MINOR_VERSION < 10
+#if GTK_CHECK_VERSION (2, 0, 0) && ! GTK_CHECK_VERSION (2, 10, 0)
/* GTK 2.2-2.8 has a bug that makes gdk_display_close crash (bug
http://bugzilla.gnome.org/show_bug.cgi?id=85715). This way we
can continue running, but there will be memory leaks. */
@@ -1155,7 +1155,8 @@
has backported it to Gtk+ 2.0 and they add the resize grip for
Gtk+ 2.0 applications also. But it has a bug that makes Emacs loop
forever, so disable the grip. */
-#if GTK_MAJOR_VERSION < 3 && defined (HAVE_GTK_WINDOW_SET_HAS_RESIZE_GRIP)
+#if (! GTK_CHECK_VERSION (3, 0, 0) \
+ && defined HAVE_GTK_WINDOW_SET_HAS_RESIZE_GRIP)
gtk_window_set_has_resize_grip (GTK_WINDOW (wtop), FALSE);
#endif
=== modified file 'src/xfns.c'
--- a/src/xfns.c 2013-05-08 22:56:08 +0000
+++ b/src/xfns.c 2013-05-09 14:49:56 +0000
@@ -3804,7 +3804,7 @@
Return false if and only if the workarea information cannot be
obtained via the _NET_WORKAREA root window property. */
-#if ! (defined USE_GTK && GTK_PREREQ (3, 4))
+#if ! GTK_CHECK_VERSION (3, 4, 0)
static bool
x_get_net_workarea (struct x_display_info *dpyinfo, XRectangle *rect)
{
@@ -4265,7 +4265,7 @@
/ x_display_pixel_height (dpyinfo));
gdpy = gdk_x11_lookup_xdisplay (dpyinfo->display);
gscreen = gdk_display_get_default_screen (gdpy);
-#if GTK_PREREQ (2, 20)
+#if GTK_CHECK_VERSION (2, 20, 0)
primary_monitor = gdk_screen_get_primary_monitor (gscreen);
#endif
n_monitors = gdk_screen_get_n_monitors (gscreen);
@@ -4300,7 +4300,7 @@
gdk_screen_get_monitor_geometry (gscreen, i, &rec);
geometry = list4i (rec.x, rec.y, rec.width, rec.height);
-#if GTK_PREREQ (2, 14)
+#if GTK_CHECK_VERSION (2, 14, 0)
width_mm = gdk_screen_get_monitor_width_mm (gscreen, i);
height_mm = gdk_screen_get_monitor_height_mm (gscreen, i);
#endif
@@ -4312,7 +4312,7 @@
list2i (width_mm, height_mm)),
attributes);
-#if GTK_PREREQ (3, 4)
+#if GTK_CHECK_VERSION (3, 4, 0)
gdk_screen_get_monitor_workarea (gscreen, i, &rec);
workarea = list4i (rec.x, rec.y, rec.width, rec.height);
#else
@@ -4339,7 +4339,7 @@
attributes = Fcons (Fcons (Qworkarea, workarea), attributes);
attributes = Fcons (Fcons (Qgeometry, geometry), attributes);
-#if GTK_PREREQ (2, 14)
+#if GTK_CHECK_VERSION (2, 14, 0)
{
char *name = gdk_screen_get_monitor_plug_name (gscreen, i);
if (name)
=== modified file 'src/xterm.c'
--- a/src/xterm.c 2013-05-08 22:56:08 +0000
+++ b/src/xterm.c 2013-05-09 14:49:56 +0000
@@ -9921,7 +9921,7 @@
dpy = DEFAULT_GDK_DISPLAY ();
-#if ! GTK_PREREQ (2, 90)
+#if ! GTK_CHECK_VERSION (2, 90, 0)
/* Load our own gtkrc if it exists. */
{
const char *file = "~/.emacs.d/gtkrc";
=== modified file 'src/xterm.h'
--- a/src/xterm.h 2013-05-08 22:56:08 +0000
+++ b/src/xterm.h 2013-05-09 14:49:56 +0000
@@ -43,10 +43,6 @@
typedef Widget xt_or_gtk_widget;
#endif
-/* True iff GTK's version is at least MAJOR.MINOR. */
-#define GTK_PREREQ(major, minor) \
- ((major) < GTK_MAJOR_VERSION + ((minor) <= GTK_MINOR_VERSION))
-
#ifdef USE_GTK
#include <gtk/gtk.h>
#include <gdk/gdkx.h>
@@ -57,14 +53,26 @@
#undef XSync
#define XSync(d, b) do { gdk_window_process_all_updates (); \
XSync (d, b); } while (0)
+#endif /* USE_GTK */
+
+/* True iff GTK's version is at least I.J.K. */
+#ifndef GTK_CHECK_VERSION
+# ifdef USE_GTK
+# define GTK_CHECK_VERSION(i, j, k) \
+ ((i) \
+ < GTK_MAJOR_VERSION + ((j) \
+ < GTK_MINOR_VERSION + ((k) \
+ <= GTK_MICRO_VERSION)))
+# else
+# define GTK_CHECK_VERSION(i, j, k) 0
+# endif
+#endif
/* The GtkTooltip API came in 2.12, but gtk-enable-tooltips in 2.14. */
-#if GTK_PREREQ (2, 14)
+#if GTK_CHECK_VERSION (2, 14, 0)
#define USE_GTK_TOOLTIP
#endif
-#endif /* USE_GTK */
-
/* Bookkeeping to distinguish X versions. */
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r112533: * xterm.h (GTK_PREREQ): Remove, replacing with GTK_CHECK_VERSION.,
Paul Eggert <=