From 01e0b5adf4e35c2b00705c212b853936fe218cac Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sun, 13 Mar 2011 00:42:12 -0800 Subject: [PATCH] * gtkutil.c (gdk_window_get_screen): Make it clear that this macro is needed only if USE_GTK_TOOLTIP. --- src/ChangeLog | 2 ++ src/gtkutil.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/ChangeLog b/src/ChangeLog index 45f9918c864..0097626c463 100644 --- 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 2eb088b9ee3..754f61e366d 100644 --- a/src/gtkutil.c +++ b/src/gtkutil.c @@ -74,7 +74,9 @@ along with GNU Emacs. If not, see . */ #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) \ -- 2.39.2