* gtkutil.c (gdk_window_get_screen): Make it clear that this macro is needed

only if USE_GTK_TOOLTIP.

diff --git a/src/ChangeLog b/src/ChangeLog
index 45f9918c864c8c534c432f724e786c9594fe0991..0097626c463302f6d1b6b9079dfa3896ab51c266 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -4,6 +4,8 @@
        to unsigned char * to avoid compiler diagnostic.
        (xg_free_frame_widgets): Make it clear that a local variable is
        needed only if USE_GTK_TOOLTIP.
+       (gdk_window_get_screen): Make it clear that this macro is needed
+       only if USE_GTK_TOOLTIP.
        (int_gtk_range_get_value): New function, which avoids a diagnostic
        from gcc -Wbad-function-cast.
        (xg_set_toolkit_scroll_bar_thumb): Use it.

diff --git a/src/gtkutil.c b/src/gtkutil.c
index 2eb088b9ee3772a45d31e8d944a7f5630dcc5da1..754f61e366d6e37350d3d62d48940bb15a5d4870 100644 (file)
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -74,7 +74,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #endif
 
 #ifndef HAVE_GTK3
+#ifdef USE_GTK_TOOLTIP
 #define gdk_window_get_screen(w) gdk_drawable_get_screen (w)
+#endif
 #define gdk_window_get_geometry(w, a, b, c, d) \
   gdk_window_get_geometry (w, a, b, c, d, 0)
 #define gdk_x11_window_lookup_for_display(d, w) \