[Emacs-diffs] /srv/bzr/emacs/trunk r100965: Don't use Gtk+ tooltip unless Gtk+ version => 2.14.

[Jan D.]

------------------------------------------------------------
revno: 100965
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Mon 2010-08-02 14:50:03 +0200
message:
  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.
modified:
  src/ChangeLog
  src/xterm.h

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-08-02 07:03:12 +0000
+++ b/src/ChangeLog     2010-08-02 12:50:03 +0000
@@ -1,5 +1,17 @@
 2010-08-02  Jan Djärv  <address@hidden>
 
+       * 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).
 

=== modified file 'src/xterm.h'
--- a/src/xterm.h       2010-08-01 13:57:07 +0000
+++ b/src/xterm.h       2010-08-02 12:50:03 +0000
@@ -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. */