Mercurial > emacs
changeset 109616:9760620de530
Don't use Gtk+ tooltip unless Gtk+ version => 2.14.
* gtkutil.c (hierarchy_ch_cb, qttip_cb): Do not define unless
USE_GTK_TOOLTIP.
(xg_prepare_tooltip): Return 0 unless USE_GTK_TOOLTIP
(xg_show_tooltip, xg_hide_tooltip): Do nothing unless
USE_GTK_TOOLTIP.
(xg_create_frame_widgets): Surrond tooltip-related code with ifdef
USE_GTK_TOOLTIP.
(xg_free_frame_widgets): Don't delete ttip_* unless USE_GTK_TOOLTIP.
* xterm.h (USE_GTK_TOOLTIP): New define.
(struct x_output): Put ttip_* inside ifdef USE_GTK_TOOLTIP.
| author | Jan D. <jan.h.d@swipnet.se> |
|---|---|
| date | Mon, 02 Aug 2010 14:50:03 +0200 |
| parents | 09adf0d4c6d9 |
| children | 7fa7e34c0f18 |
| files | src/ChangeLog src/xterm.h |
| diffstat | 2 files changed, 20 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Mon Aug 02 14:46:33 2010 +0200 +++ b/src/ChangeLog Mon Aug 02 14:50:03 2010 +0200 @@ -1,5 +1,17 @@ 2010-08-02 Jan Djärv <jan.h.d@swipnet.se> + * gtkutil.c (hierarchy_ch_cb, qttip_cb): Do not define unless + USE_GTK_TOOLTIP. + (xg_prepare_tooltip): Return 0 unless USE_GTK_TOOLTIP + (xg_show_tooltip, xg_hide_tooltip): Do nothing unless + USE_GTK_TOOLTIP. + (xg_create_frame_widgets): Surrond tooltip-related code with ifdef + USE_GTK_TOOLTIP. + (xg_free_frame_widgets): Don't delete ttip_* unless USE_GTK_TOOLTIP. + + * xterm.h (USE_GTK_TOOLTIP): New define. + (struct x_output): Put ttip_* inside ifdef USE_GTK_TOOLTIP. + * sysdep.c (child_setup_tty): Enable ICANON in lflags and set VEOF to Control-D (Bug#6771).
--- a/src/xterm.h Mon Aug 02 14:46:33 2010 +0200 +++ b/src/xterm.h Mon Aug 02 14:50:03 2010 +0200 @@ -51,6 +51,10 @@ #define XSync(d, b) do { gdk_window_process_all_updates (); \ XSync (d, b); } while (0) +/* The GtkTooltip API came in 2.12, but gtk-enable-tooltips in 2.14. */ +#if GTK_MAJOR_VERSION > 2 || GTK_MINOR_VERSION > 13 +#define USE_GTK_TOOLTIP +#endif #endif /* USE_GTK */ @@ -503,10 +507,13 @@ GdkGeometry size_hints; long hint_flags; +#ifdef USE_GTK_TOOLTIP GtkTooltip *ttip_widget; GtkWidget *ttip_lbl; GtkWindow *ttip_window; -#endif +#endif /* USE_GTK_TOOLTIP */ + +#endif /* USE_GTK */ /* If >=0, a bitmap index. The indicated bitmap is used for the icon. */