Skip to content

GitLab

gtk
gtk
Commit e667f049 authored by Havoc Pennington's avatar Havoc Pennington Committed by Havoc Pennington
Browse files
Options

Test set_markup_with_accel() 

2000-11-01  Havoc Pennington  <hp@redhat.com>

	* gtk/testgtk.c (create_labels): Test set_markup_with_accel()

	* gtk/gtklabel.c (set_markup): Convert the unichar to a GDK keyval
	before returning it.
parent fcaa719b
Hide whitespace changes
Inline Side-by-side
Showing with 105 additions and 38 deletions
ChangeLog
View file @ e667f049
2000-11-01 Havoc Pennington <hp@redhat.com>
* gtk/testgtk.c (create_labels): Test set_markup_with_accel()
* gtk/gtklabel.c (set_markup): Convert the unichar to a GDK keyval
before returning it.
2000-11-01 Havoc Pennington <hp@redhat.com>
* gdk/gdkpixbuf-render.c (gdk_pixbuf_render_to_drawable_alpha):
Clip the rectangle to be rendered to the drawable, since
get_from_drawable() requires a region within the drawable
get_from_drawable() requires a region within the drawable
2000-11-01 Havoc Pennington <hp@redhat.com>
......
ChangeLog.pre-2-0
View file @ e667f049
2000-11-01 Havoc Pennington <hp@redhat.com>
* gtk/testgtk.c (create_labels): Test set_markup_with_accel()
* gtk/gtklabel.c (set_markup): Convert the unichar to a GDK keyval
before returning it.
2000-11-01 Havoc Pennington <hp@redhat.com>
* gdk/gdkpixbuf-render.c (gdk_pixbuf_render_to_drawable_alpha):
Clip the rectangle to be rendered to the drawable, since
get_from_drawable() requires a region within the drawable
get_from_drawable() requires a region within the drawable
2000-11-01 Havoc Pennington <hp@redhat.com>
......
ChangeLog.pre-2-10
View file @ e667f049
2000-11-01 Havoc Pennington <hp@redhat.com>
* gtk/testgtk.c (create_labels): Test set_markup_with_accel()
* gtk/gtklabel.c (set_markup): Convert the unichar to a GDK keyval
before returning it.
2000-11-01 Havoc Pennington <hp@redhat.com>
* gdk/gdkpixbuf-render.c (gdk_pixbuf_render_to_drawable_alpha):
Clip the rectangle to be rendered to the drawable, since
get_from_drawable() requires a region within the drawable
get_from_drawable() requires a region within the drawable
2000-11-01 Havoc Pennington <hp@redhat.com>
......
ChangeLog.pre-2-2
View file @ e667f049
2000-11-01 Havoc Pennington <hp@redhat.com>
* gtk/testgtk.c (create_labels): Test set_markup_with_accel()
* gtk/gtklabel.c (set_markup): Convert the unichar to a GDK keyval
before returning it.
2000-11-01 Havoc Pennington <hp@redhat.com>
* gdk/gdkpixbuf-render.c (gdk_pixbuf_render_to_drawable_alpha):
Clip the rectangle to be rendered to the drawable, since
get_from_drawable() requires a region within the drawable
get_from_drawable() requires a region within the drawable
2000-11-01 Havoc Pennington <hp@redhat.com>
......
ChangeLog.pre-2-4
View file @ e667f049
2000-11-01 Havoc Pennington <hp@redhat.com>
* gtk/testgtk.c (create_labels): Test set_markup_with_accel()
* gtk/gtklabel.c (set_markup): Convert the unichar to a GDK keyval
before returning it.
2000-11-01 Havoc Pennington <hp@redhat.com>
* gdk/gdkpixbuf-render.c (gdk_pixbuf_render_to_drawable_alpha):
Clip the rectangle to be rendered to the drawable, since
get_from_drawable() requires a region within the drawable
get_from_drawable() requires a region within the drawable
2000-11-01 Havoc Pennington <hp@redhat.com>
......
ChangeLog.pre-2-6
View file @ e667f049
2000-11-01 Havoc Pennington <hp@redhat.com>
* gtk/testgtk.c (create_labels): Test set_markup_with_accel()
* gtk/gtklabel.c (set_markup): Convert the unichar to a GDK keyval
before returning it.
2000-11-01 Havoc Pennington <hp@redhat.com>
* gdk/gdkpixbuf-render.c (gdk_pixbuf_render_to_drawable_alpha):
Clip the rectangle to be rendered to the drawable, since
get_from_drawable() requires a region within the drawable
get_from_drawable() requires a region within the drawable
2000-11-01 Havoc Pennington <hp@redhat.com>
......
ChangeLog.pre-2-8
View file @ e667f049
2000-11-01 Havoc Pennington <hp@redhat.com>
* gtk/testgtk.c (create_labels): Test set_markup_with_accel()
* gtk/gtklabel.c (set_markup): Convert the unichar to a GDK keyval
before returning it.
2000-11-01 Havoc Pennington <hp@redhat.com>
* gdk/gdkpixbuf-render.c (gdk_pixbuf_render_to_drawable_alpha):
Clip the rectangle to be rendered to the drawable, since
get_from_drawable() requires a region within the drawable
get_from_drawable() requires a region within the drawable
2000-11-01 Havoc Pennington <hp@redhat.com>
......
gtk/gtklabel.c
View file @ e667f049
......@@ -285,7 +285,7 @@ set_markup (GtkLabel *label,
}
if (accel_char != 0)
return gdk_keyval_to_lower (accel_char);
return gdk_keyval_to_lower (gdk_unicode_to_keyval (accel_char));
else
return GDK_VoidSymbol;
}
......
gtk/testgtk.c
View file @ e667f049
......@@ -2002,6 +2002,8 @@ void create_labels (void)
if (!window)
{
guint keyval;
window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
gtk_signal_connect (GTK_OBJECT (window), "destroy",
GTK_SIGNAL_FUNC(gtk_widget_destroyed),
......@@ -2091,21 +2093,28 @@ void create_labels (void)
frame = gtk_frame_new ("Markup label");
label = gtk_label_new (NULL);
gtk_label_set_markup (GTK_LABEL (label),
"This <span foreground=\"blue\" background=\"orange\">label</span> has "
"<b>markup</b> such as "
"<big><i>Big Italics</i></big>\n"
"<tt>Monospace font</tt>\n"
"<u>Underline!</u>\n"
"foo\n"
"<span foreground=\"green\" background=\"red\">Ugly colors</span>\n"
"and nothing on this line,\n"
"or this.\n"
"or this either\n"
"or even on this one\n"
"la <big>la <big>la <big>la <big>la</big></big></big></big>\n"
"but this word is <span foreground=\"purple\"><big>purple</big></span>\n"
"We like <sup>superscript</sup> and <sub>subscript</sub> too");
/* There's also a gtk_label_set_markup() without accel if you
* don't have an accelerator key
*/
keyval =
gtk_label_set_markup_with_accel (GTK_LABEL (label),
"This <span foreground=\"blue\" background=\"orange\">label</span> has "
"<b>markup</b> _such as "
"<big><i>Big Italics</i></big>\n"
"<tt>Monospace font</tt>\n"
"<u>Underline!</u>\n"
"foo\n"
"<span foreground=\"green\" background=\"red\">Ugly colors</span>\n"
"and nothing on this line,\n"
"or this.\n"
"or this either\n"
"or even on this one\n"
"la <big>la <big>la <big>la <big>la</big></big></big></big>\n"
"but this _word is <span foreground=\"purple\"><big>purple</big></span>\n"
"We like <sup>superscript</sup> and <sub>subscript</sub> too");
g_return_if_fail (keyval != GDK_s);
gtk_container_add (GTK_CONTAINER (frame), label);
gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
......
tests/testgtk.c
View file @ e667f049
......@@ -2002,6 +2002,8 @@ void create_labels (void)
if (!window)
{
guint keyval;
window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
gtk_signal_connect (GTK_OBJECT (window), "destroy",
GTK_SIGNAL_FUNC(gtk_widget_destroyed),
......@@ -2091,21 +2093,28 @@ void create_labels (void)
frame = gtk_frame_new ("Markup label");
label = gtk_label_new (NULL);
gtk_label_set_markup (GTK_LABEL (label),
"This <span foreground=\"blue\" background=\"orange\">label</span> has "
"<b>markup</b> such as "
"<big><i>Big Italics</i></big>\n"
"<tt>Monospace font</tt>\n"
"<u>Underline!</u>\n"
"foo\n"
"<span foreground=\"green\" background=\"red\">Ugly colors</span>\n"
"and nothing on this line,\n"
"or this.\n"
"or this either\n"
"or even on this one\n"
"la <big>la <big>la <big>la <big>la</big></big></big></big>\n"
"but this word is <span foreground=\"purple\"><big>purple</big></span>\n"
"We like <sup>superscript</sup> and <sub>subscript</sub> too");
/* There's also a gtk_label_set_markup() without accel if you
* don't have an accelerator key
*/
keyval =
gtk_label_set_markup_with_accel (GTK_LABEL (label),
"This <span foreground=\"blue\" background=\"orange\">label</span> has "
"<b>markup</b> _such as "
"<big><i>Big Italics</i></big>\n"
"<tt>Monospace font</tt>\n"
"<u>Underline!</u>\n"
"foo\n"
"<span foreground=\"green\" background=\"red\">Ugly colors</span>\n"
"and nothing on this line,\n"
"or this.\n"
"or this either\n"
"or even on this one\n"
"la <big>la <big>la <big>la <big>la</big></big></big></big>\n"
"but this _word is <span foreground=\"purple\"><big>purple</big></span>\n"
"We like <sup>superscript</sup> and <sub>subscript</sub> too");
g_return_if_fail (keyval != GDK_s);
gtk_container_add (GTK_CONTAINER (frame), label);
gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment