pygtk r3065 - in branches/pygtk-2-14: . docs/reference

[paulp svn gnome org]

Author: paulp
Date: Tue Jan  6 21:08:10 2009
New Revision: 3065
URL: http://svn.gnome.org/viewvc/pygtk?rev=3065&view=rev

Log:
Merge from trunk:

2008-09-22  Gian Mario Tagliaretti  <gianmt gnome org>

	Bug 541510 â pango.layout missing document on
	layout.get_font_description()

	* pygtk-pangolayout.xml: add pango.Layout.get_font_description()


Modified:
   branches/pygtk-2-14/   (props changed)
   branches/pygtk-2-14/docs/reference/ChangeLog
   branches/pygtk-2-14/docs/reference/pygtk-pangolayout.xml

Modified: branches/pygtk-2-14/docs/reference/pygtk-pangolayout.xml
==============================================================================
--- branches/pygtk-2-14/docs/reference/pygtk-pangolayout.xml	(original)
+++ branches/pygtk-2-14/docs/reference/pygtk-pangolayout.xml	Tue Jan  6 21:08:10 2009
@@ -65,6 +65,11 @@
       </methodsynopsis>
       <methodsynopsis language="python">
 	<methodname><link
+linkend="method-pangolayout--get-font-description">get_font_description</link></methodname>
+	<methodparam></methodparam>
+      </methodsynopsis>
+      <methodsynopsis language="python">
+	<methodname><link
 linkend="method-pangolayout--set-font-description">set_font_description</link></methodname>
 	<methodparam><parameter
 		       role="keyword">desc</parameter></methodparam>
@@ -476,6 +481,25 @@
 using two <parameter>accel_marker</parameter> characters together.</para>
 
     </refsect2>
+    
+    <refsect2 id="method-pangolayout--get-font-description">
+      <title>pango.Layout.get_font_description</title>
+
+      <programlisting><methodsynopsis language="python">
+	  <methodname>get_font_description</methodname>
+	  <methodparam></methodparam>  </methodsynopsis></programlisting>
+      <variablelist>
+	<varlistentry>
+	  <term><emphasis>Returns</emphasis>&nbsp;:</term>
+	  <listitem><simpara>the layout's font description, or <literal>None</literal>
+	  if the font description from the layout's context is inherited.</simpara></listitem>
+	</varlistentry>
+      </variablelist>
+
+      <para>The <methodname>get_font_description</methodname>() method returns
+      the font description for the layout, if any</para>
+
+    </refsect2>
 
     <refsect2 id="method-pangolayout--set-font-description">
       <title>pango.Layout.set_font_description</title>