diff options
| author | Paul Eggert | 2011-03-13 00:15:55 -0800 |
|---|---|---|
| committer | Paul Eggert | 2011-03-13 00:15:55 -0800 |
| commit | b0afc268e8513939e5fc0551f33aec6884e7a4e6 (patch) | |
| tree | f75f8efeeb61c0dcc9a0bd8d729535aa23d90ad9 | |
| parent | 7c86ee9804efc475aa261c8eab8ca9b629657e29 (diff) | |
| download | emacs-b0afc268e8513939e5fc0551f33aec6884e7a4e6.tar.gz emacs-b0afc268e8513939e5fc0551f33aec6884e7a4e6.zip | |
* gtkutil.c (xg_free_frame_widgets): Make it clear that a local variable is
needed only if USE_GTK_TOOLTIP.
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/gtkutil.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 2d88ba25092..269285d32b0 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -2,6 +2,8 @@ | |||
| 2 | 2 | ||
| 3 | * gtkutil.c (xg_get_pixbuf_from_pixmap): Add cast from char * | 3 | * gtkutil.c (xg_get_pixbuf_from_pixmap): Add cast from char * |
| 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 | ||
| 6 | needed only if USE_GTK_TOOLTIP. | ||
| 5 | 7 | ||
| 6 | * xgselect.c (xg_select): Remove unused var. | 8 | * xgselect.c (xg_select): Remove unused var. |
| 7 | 9 | ||
diff --git a/src/gtkutil.c b/src/gtkutil.c index 8ab41fdefd1..04b8a64c995 100644 --- a/src/gtkutil.c +++ b/src/gtkutil.c | |||
| @@ -1188,7 +1188,9 @@ xg_free_frame_widgets (FRAME_PTR f) | |||
| 1188 | { | 1188 | { |
| 1189 | if (FRAME_GTK_OUTER_WIDGET (f)) | 1189 | if (FRAME_GTK_OUTER_WIDGET (f)) |
| 1190 | { | 1190 | { |
| 1191 | #ifdef USE_GTK_TOOLTIP | ||
| 1191 | struct x_output *x = f->output_data.x; | 1192 | struct x_output *x = f->output_data.x; |
| 1193 | #endif | ||
| 1192 | gtk_widget_destroy (FRAME_GTK_OUTER_WIDGET (f)); | 1194 | gtk_widget_destroy (FRAME_GTK_OUTER_WIDGET (f)); |
| 1193 | FRAME_X_WINDOW (f) = 0; /* Set to avoid XDestroyWindow in xterm.c */ | 1195 | FRAME_X_WINDOW (f) = 0; /* Set to avoid XDestroyWindow in xterm.c */ |
| 1194 | FRAME_GTK_OUTER_WIDGET (f) = 0; | 1196 | FRAME_GTK_OUTER_WIDGET (f) = 0; |