aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2011-03-13 00:42:12 -0800
committerPaul Eggert2011-03-13 00:42:12 -0800
commit01e0b5adf4e35c2b00705c212b853936fe218cac (patch)
tree3f35339a69b3aca67635b07d615e8f6cd79806d5 /src
parent65dc836c9eb47c01affa6c8819f177c9f68aca67 (diff)
downloademacs-01e0b5adf4e35c2b00705c212b853936fe218cac.tar.gz
emacs-01e0b5adf4e35c2b00705c212b853936fe218cac.zip
* gtkutil.c (gdk_window_get_screen): Make it clear that this macro is needed
only if USE_GTK_TOOLTIP.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog2
-rw-r--r--src/gtkutil.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 45f9918c864..0097626c463 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -4,6 +4,8 @@
4 to unsigned char * to avoid compiler diagnostic. 4 to unsigned char * to avoid compiler diagnostic.
5 (xg_free_frame_widgets): Make it clear that a local variable is 5 (xg_free_frame_widgets): Make it clear that a local variable is
6 needed only if USE_GTK_TOOLTIP. 6 needed only if USE_GTK_TOOLTIP.
7 (gdk_window_get_screen): Make it clear that this macro is needed
8 only if USE_GTK_TOOLTIP.
7 (int_gtk_range_get_value): New function, which avoids a diagnostic 9 (int_gtk_range_get_value): New function, which avoids a diagnostic
8 from gcc -Wbad-function-cast. 10 from gcc -Wbad-function-cast.
9 (xg_set_toolkit_scroll_bar_thumb): Use it. 11 (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 <http://www.gnu.org/licenses/>. */
74#endif 74#endif
75 75
76#ifndef HAVE_GTK3 76#ifndef HAVE_GTK3
77#ifdef USE_GTK_TOOLTIP
77#define gdk_window_get_screen(w) gdk_drawable_get_screen (w) 78#define gdk_window_get_screen(w) gdk_drawable_get_screen (w)
79#endif
78#define gdk_window_get_geometry(w, a, b, c, d) \ 80#define gdk_window_get_geometry(w, a, b, c, d) \
79 gdk_window_get_geometry (w, a, b, c, d, 0) 81 gdk_window_get_geometry (w, a, b, c, d, 0)
80#define gdk_x11_window_lookup_for_display(d, w) \ 82#define gdk_x11_window_lookup_for_display(d, w) \