aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert <[email protected]>2011-03-13 00:15:55 -0800
committerPaul Eggert <[email protected]>2011-03-13 00:15:55 -0800
commitb0afc268e8513939e5fc0551f33aec6884e7a4e6 (patch)
treef75f8efeeb61c0dcc9a0bd8d729535aa23d90ad9
parent7c86ee9804efc475aa261c8eab8ca9b629657e29 (diff)
* gtkutil.c (xg_free_frame_widgets): Make it clear that a local variable is
needed only if USE_GTK_TOOLTIP.
-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 2d88ba2509..269285d32b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -2,6 +2,8 @@
* gtkutil.c (xg_get_pixbuf_from_pixmap): Add cast from char *
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.
* xgselect.c (xg_select): Remove unused var.
diff --git a/src/gtkutil.c b/src/gtkutil.c
index 8ab41fdefd..04b8a64c99 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -1188,7 +1188,9 @@ xg_free_frame_widgets (FRAME_PTR f)
{
if (FRAME_GTK_OUTER_WIDGET (f))
{
+#ifdef USE_GTK_TOOLTIP
struct x_output *x = f->output_data.x;
+#endif
gtk_widget_destroy (FRAME_GTK_OUTER_WIDGET (f));
FRAME_X_WINDOW (f) = 0; /* Set to avoid XDestroyWindow in xterm.c */
FRAME_GTK_OUTER_WIDGET (f) = 0;