Make 3.0 parallel-installable to 2.x

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

diff --git a/docs/reference/gtk/tmpl/gtkdrawingarea.sgml b/docs/reference/gtk/tmpl/gtkdrawingarea.sgml
index 9b686dd64a0feb888c242bdbca2df3ca61e784ce..1edf19d42739b2d2b3f59b5f3d54dfcf2f5aa1bb 100644 (file)
--- a/docs/reference/gtk/tmpl/gtkdrawingarea.sgml
+++ b/docs/reference/gtk/tmpl/gtkdrawingarea.sgml
@@ -2,7 +2,7 @@
 GtkDrawingArea
 
 <!-- ##### SECTION Short_Description ##### -->
-a widget for custom user interface elements.
+A widget for custom user interface elements
 
 <!-- ##### SECTION Long_Description ##### -->
 <para>
@@ -53,10 +53,10 @@ that drawing is implicitly clipped to the exposed area.
 <title>Simple <structname>GtkDrawingArea</structname> usage.</title>
 <programlisting>
 gboolean
-expose_event_callback (GdkWidget *widget, GdkEventExpose *event, gpointer data)
+expose_event_callback (GtkWidget *widget, GdkEventExpose *event, gpointer data)
 {
   gdk_draw_arc (widget->window,
-                widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
+                widget->style->fg_gc[gtk_widget_get_state (widget)],
                 TRUE,
                 0, 0, widget->allocation.width, widget->allocation.height,
                 0, 64 * 360);
@@ -64,7 +64,7 @@ expose_event_callback (GdkWidget *widget, GdkEventExpose *event, gpointer data)
   return TRUE;
 }
 [...]
-  GtkWidget *drawing_area = gtk_drawing_area_new (<!>);
+  GtkWidget *drawing_area = gtk_drawing_area_new (<!-- -->);
   gtk_widget_set_size_request (drawing_area, 100, 100);
   g_signal_connect (G_OBJECT (drawing_area), "expose_event",  
                     G_CALLBACK (expose_event_callback), NULL);
@@ -83,7 +83,7 @@ then get an expose event for the invalid region.
 <para>
 The available routines for drawing are documented on the <link
 linkend="gdk-Drawing-Primitives">GDK Drawing Primitives</link> page.
-See also gdk_pixbuf_render_to_drawable() for drawing a #GdkPixbuf.
+See also gdk_draw_pixbuf() for drawing a #GdkPixbuf.
 </para>
 
 <para>
@@ -104,6 +104,12 @@ calling gtk_widget_queue_draw() on the #GtkImage when you want to
 refresh to the screen.
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GtkDrawingArea ##### -->
 <para>
 The #GtkDrawingArea struct contains private data only, and
@@ -116,21 +122,7 @@ should be accessed using the functions below.
 Creates a new drawing area.
 </para>
 
+@void: 
 @Returns: a new #GtkDrawingArea
 
 
-<!-- ##### FUNCTION gtk_drawing_area_size ##### -->
-<para>
-(Use gtk_widget_set_size_request() instead.)
-Sets the size that the drawing area will request
-in response to a "size_request" signal. The 
-drawing area may actually be allocated a size
-larger than this depending on how it is packed
-within the enclosing containers.
-</para>
-
-@darea: a #GtkDrawingArea.
-@width: the width to request.
-@height: the height to request.
-
-