[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r105045: Don't let Gtk+ linewrap tool
From: |
Jan D. |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r105045: Don't let Gtk+ linewrap tooltips. |
Date: |
Fri, 08 Jul 2011 19:25:17 +0200 |
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 105045
fixes bug(s): http://debbugs.gnu.org/8591
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Fri 2011-07-08 19:25:17 +0200
message:
Don't let Gtk+ linewrap tooltips.
* gtkutil.c (xg_prepare_tooltip): Fix indentation and comment.
Put text in x->ttip_lbl instead of gtk_tooltip_set_text.
(xg_hide_tooltip): Fix comment.
modified:
src/ChangeLog
src/gtkutil.c
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2011-07-08 15:39:40 +0000
+++ b/src/ChangeLog 2011-07-08 17:25:17 +0000
@@ -1,5 +1,9 @@
2011-07-08 Jan Djärv <address@hidden>
+ * 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.
=== modified file 'src/gtkutil.c'
--- a/src/gtkutil.c 2011-06-26 18:47:07 +0000
+++ b/src/gtkutil.c 2011-07-08 17:25:17 +0000
@@ -659,8 +659,8 @@
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 @@
(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 @@
}
/* 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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r105045: Don't let Gtk+ linewrap tooltips.,
Jan D. <=