Make 3.0 parallel-installable to 2.x

[~andy/gtk] / docs / reference / gtk / tmpl / gtklayout.sgml

diff --git a/docs/reference/gtk/tmpl/gtklayout.sgml b/docs/reference/gtk/tmpl/gtklayout.sgml
index ded7a594cc6e705c2b2d671efcf7dc026f4b39cd..1b32027d0cc69c0fd0749b4fa7fdbf06a734e882 100644 (file)
--- a/docs/reference/gtk/tmpl/gtklayout.sgml
+++ b/docs/reference/gtk/tmpl/gtklayout.sgml
@@ -3,23 +3,81 @@ GtkLayout
 
 <!-- ##### SECTION Short_Description ##### -->
 
+Infinite scrollable area containing child widgets and/or custom drawing
 
 <!-- ##### SECTION Long_Description ##### -->
 <para>
+#GtkLayout is similar to #GtkDrawingArea in that it's a "blank slate"
+and doesn't do anything but paint a blank background by default. It's
+different in that it supports scrolling natively (you can add it to a
+#GtkScrolledWindow), and it can contain child widgets, since it's a
+#GtkContainer. However if you're just going to draw, a #GtkDrawingArea
+is a better choice since it has lower overhead.
+</para>
 
+<para>
+When handling expose events on a #GtkLayout, you must draw to 
+GTK_LAYOUT (layout)-&gt;bin_window, rather than to 
+GTK_WIDGET (layout)-&gt;window, as you would for a drawing
+area.
 </para>
 
 <!-- ##### SECTION See_Also ##### -->
 <para>
-
+#GtkDrawingArea, #GtkScrolledWindow
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GtkLayout ##### -->
 <para>
 
 </para>
 
 
+<!-- ##### SIGNAL GtkLayout::set-scroll-adjustments ##### -->
+<para>
+
+</para>
+
+@layout: the object which received the signal.
+@arg1: 
+@arg2: 
+
+<!-- ##### ARG GtkLayout:hadjustment ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkLayout:height ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkLayout:vadjustment ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkLayout:width ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkLayout:x ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkLayout:y ##### -->
+<para>
+
+</para>
+
 <!-- ##### FUNCTION gtk_layout_new ##### -->
 <para>
 
@@ -36,7 +94,7 @@ GtkLayout
 </para>
 
 @layout: 
-@widget: 
+@child_widget: 
 @x: 
 @y: 
 
@@ -47,7 +105,7 @@ GtkLayout
 </para>
 
 @layout: 
-@widget: 
+@child_widget: 
 @x: 
 @y: 
 
@@ -62,23 +120,26 @@ GtkLayout
 @height: 
 
 
-<!-- ##### FUNCTION gtk_layout_freeze ##### -->
+<!-- ##### FUNCTION gtk_layout_get_size ##### -->
 <para>
 
 </para>
 
 @layout: 
+@width: 
+@height: 
 
 
-<!-- ##### FUNCTION gtk_layout_thaw ##### -->
+<!-- ##### FUNCTION gtk_layout_get_hadjustment ##### -->
 <para>
 
 </para>
 
 @layout: 
+@Returns: 
 
 
-<!-- ##### FUNCTION gtk_layout_get_hadjustment ##### -->
+<!-- ##### FUNCTION gtk_layout_get_vadjustment ##### -->
 <para>
 
 </para>
@@ -87,16 +148,16 @@ GtkLayout
 @Returns: 
 
 
-<!-- ##### FUNCTION gtk_layout_get_vadjustment ##### -->
+<!-- ##### FUNCTION gtk_layout_set_hadjustment ##### -->
 <para>
 
 </para>
 
 @layout: 
-@Returns: 
+@adjustment: 
 
 
-<!-- ##### FUNCTION gtk_layout_set_hadjustment ##### -->
+<!-- ##### FUNCTION gtk_layout_set_vadjustment ##### -->
 <para>
 
 </para>
@@ -105,12 +166,12 @@ GtkLayout
 @adjustment: 
 
 
-<!-- ##### FUNCTION gtk_layout_set_vadjustment ##### -->
+<!-- ##### FUNCTION gtk_layout_get_bin_window ##### -->
 <para>
 
 </para>
 
 @layout: 
-@adjustment: 
+@Returns: