callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Chain up in buildable_finish()

Browse Source 
* gtk/gtkwindow.c: Chain up in buildable_finish()

	* gtk/gtkbuilder.c: _gtk_builder_get_absolute_filename() handle
	cases where g_path_get_dirname() returns "."

	* docs/reference/gtk/tmpl/gtklabel.sgml, 
	docs/reference/gtk/tmpl/gtkbuilder.sgml: Added documentation
	for the <attributes> tags on GtkLabel


svn path=/trunk/; revision=20008
This commit is contained in:
Tristan Van Berkom 2008-04-16 16:35:17 +00:00
parent 7b93b76efa
commit b1542fe913
5 changed files with 45 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -1,3 +1,14 @@
2008-04-16 Tristan Van Berkom <tvb@gnome.org>
* gtk/gtkwindow.c: Chain up in buildable_finish()
* gtk/gtkbuilder.c: _gtk_builder_get_absolute_filename() handle
cases where g_path_get_dirname() returns "."
* docs/reference/gtk/tmpl/gtklabel.sgml,
docs/reference/gtk/tmpl/gtkbuilder.sgml: Added documentation
for the <attributes> tags on GtkLabel
2008-04-15 Emmanuele Bassi <ebassi@gnome.org>
* gtk/gtkrecentmanager.c:

1
docs/reference/gtk/tmpl/gtkbuilder.sgml
View File

@ -203,6 +203,7 @@ gets parsed by the custom tag handler of the object.
These XML fragments are explained in the documentation of the
respective objects, see
<link linkend="GtkWidget-BUILDER-UI">GtkWidget</link>,
<link linkend="GtkLabel-BUILDER-UI">GtkLabel</link>,
<link linkend="GtkContainer-BUILDER-UI">GtkContainer</link>,
<link linkend="GtkDialog-BUILDER-UI">GtkDialog</link>,
<link linkend="GtkCellLayout-BUILDER-UI">GtkCellLayout</link>,

21
docs/reference/gtk/tmpl/gtklabel.sgml
View File

@ -11,6 +11,27 @@ implies, most labels are used to label another widget such as a
#GtkButton, a #GtkMenuItem, or a #GtkOptionMenu.
</para>
<refsect2 id="GtkLabel-BUILDER-UI">
<title>GtkLabel as GtkBuildable</title>
<para>
The GtkLabel implementation of the GtkBuildable interface supports a
custom &lt;attributes&gt; element, which supports any number of &lt;attribute&gt;
elements. the &lt;attribute&gt; element has attributes named name, value,
start and end and allows you to specify #PangoAttributs for this label.
</para>
<example>
<title>A UI definition fragment specifying pango attributes</title>
<programlisting><![CDATA[
<object class="GtkLabel">
<attributes>
<attribute name=\"weight\" value=\"PANGO_WEIGHT_BOLD\"/>
</attributes>
</object>
]]></programlisting>
</example>
</refsect2>
<refsect2>
<title>Mnemonics</title>

12
gtk/gtkbuilder.c
View File

@ -1460,8 +1460,16 @@ _gtk_builder_get_absolute_filename (GtkBuilder *builder, const gchar *string)
return g_strdup (string);
if (builder->priv->filename &&
strcmp (builder->priv->filename, ".") != 0)
dirname = g_path_get_dirname (builder->priv->filename);
strcmp (builder->priv->filename, ".") != 0)
{
dirname = g_path_get_dirname (builder->priv->filename);
if (strcmp (dirname, ".") == 0)
{
g_free (dirname);
dirname = g_get_current_dir ();
}
}
else
dirname = g_get_current_dir ();

2
gtk/gtkwindow.c
View File

@ -1162,6 +1162,8 @@ gtk_window_buildable_parser_finished (GtkBuildable *buildable,
if (priv->builder_visible)
gtk_widget_show (GTK_WIDGET (buildable));
parent_buildable_iface->parser_finished (buildable, builder);
}
/**