diff options
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/gtkutil.c | 11 |
2 files changed, 10 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index ff7382a87e4..74105503040 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,9 @@ 2011-07-08 Jan Djärv <jan.h.d@swipnet.se> + * gtkutil.c (xg_prepare_tooltip): Fix indentation and comment. + Put text in x->ttip_lbl instead of gtk_tooltip_set_text (Bug#8591). + (xg_hide_tooltip): Fix comment. + * nsterm.m (initFrameFromEmacs): Don't use ns_return_types in registerServicesMenuSendTypes. (validRequestorForSendType): Don't check ns_return_types. diff --git a/src/gtkutil.c b/src/gtkutil.c index 343fcfa083a..b11500bf860 100644 --- a/src/gtkutil.c +++ b/src/gtkutil.c @@ -659,8 +659,8 @@ qttip_cb (GtkWidget *widget, int xg_prepare_tooltip (FRAME_PTR f, - Lisp_Object string, - int *width, + Lisp_Object string, + int *width, int *height) { #ifndef USE_GTK_TOOLTIP @@ -697,11 +697,12 @@ xg_prepare_tooltip (FRAME_PTR f, (gtk_widget_get_display (GTK_WIDGET (x->ttip_window))), "gdk-display-current-tooltip", NULL); - /* Put out dummy widget in so we can get callbacks for unrealize and + /* Put our dummy widget in so we can get callbacks for unrealize and hierarchy-changed. */ gtk_tooltip_set_custom (x->ttip_widget, widget); - gtk_tooltip_set_text (x->ttip_widget, SSDATA (encoded_string)); + gtk_tooltip_set_text (x->ttip_widget, ""); + gtk_label_set_text (GTK_LABEL (x->ttip_lbl), SSDATA (encoded_string)); gtk_widget_get_preferred_size (GTK_WIDGET (x->ttip_window), NULL, &req); if (width) *width = req.width; if (height) *height = req.height; @@ -731,7 +732,7 @@ xg_show_tooltip (FRAME_PTR f, int root_x, int root_y) } /* Hide tooltip if shown. Do nothing if not shown. - Return non-zero if tip was hidden, non-ero if not (i.e. not using + Return non-zero if tip was hidden, non-zero if not (i.e. not using system tooltips). */ int |