Make 3.0 parallel-installable to 2.x

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

diff --git a/docs/reference/gtk/tmpl/gtktogglebutton.sgml b/docs/reference/gtk/tmpl/gtktogglebutton.sgml
index 4771692f93a60cdba7c5a7e35bcf31d2778b7f42..815d6a480b681bba01caecbfbf706594d6fe4970 100644 (file)
--- a/docs/reference/gtk/tmpl/gtktogglebutton.sgml
+++ b/docs/reference/gtk/tmpl/gtktogglebutton.sgml
@@ -2,7 +2,7 @@
 GtkToggleButton
 
 <!-- ##### SECTION Short_Description ##### -->
-create buttons which retain their state.
+Create buttons which retain their state
 
 <!-- ##### SECTION Long_Description ##### -->
 <para>
@@ -37,14 +37,14 @@ void make_toggles (void) {
    /* Makes this toggle button invisible */
    gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (toggle1), TRUE);
    
-   g_signal_connect (GTK_OBJECT (toggle1), "toggled",
+   g_signal_connect (toggle1, "toggled",
                      G_CALLBACK (output_state), NULL);
    gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->action_area),
                        toggle1, FALSE, FALSE, 2);
 
    toggle2 = gtk_toggle_button_new_with_label ("Hi, i'm another toggle button.");
    gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (toggle2), FALSE);
-   g_signal_connect (GTK_OBJECT (toggle2), "toggled",
+   g_signal_connect (toggle2, "toggled",
                      G_CALLBACK (output_state), NULL);
    gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->action_area),
                        toggle2, FALSE, FALSE, 2);
@@ -58,32 +58,66 @@ void make_toggles (void) {
 <!-- ##### SECTION See_Also ##### -->
 <para>
 <variablelist>
+
 <varlistentry>
-<term>#GtkButton</term>
-<listitem><para>a more general button.</para></listitem>
+  <term>#GtkButton</term>
+  <listitem><para>a more general button.</para></listitem>
 </varlistentry>
+
 <varlistentry>
-<term>#GtkCheckButton</term>
-<listitem><para>another way of presenting a toggle option.</para></listitem>
+  <term>#GtkCheckButton</term>
+  <listitem><para>another way of presenting a toggle option.</para></listitem>
 </varlistentry>
+
 <varlistentry>
-<term>#GtkCheckMenuItem</term>
-<listitem><para>a #GtkToggleButton  as a menu item.</para></listitem>
+  <term>#GtkCheckMenuItem</term>
+  <listitem><para>a #GtkToggleButton  as a menu item.</para></listitem>
 </varlistentry>
+
 </variablelist>
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GtkToggleButton ##### -->
 <para>
 The #GtkToggleButton struct contains private data only, and should be manipulated using the functions below.
 </para>
 
 
+<!-- ##### SIGNAL GtkToggleButton::toggled ##### -->
+<para>
+Should be connected if you wish to perform an action whenever the
+#GtkToggleButton's state is changed.
+</para>
+
+@togglebutton: the object which received the signal.
+
+<!-- ##### ARG GtkToggleButton:active ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkToggleButton:draw-indicator ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkToggleButton:inconsistent ##### -->
+<para>
+
+</para>
+
 <!-- ##### FUNCTION gtk_toggle_button_new ##### -->
 <para>
 Creates a new toggle button. A widget should be packed into the button, as in gtk_button_new().
 </para>
 
+@void: 
 @Returns: a new toggle button.
 
 
@@ -122,13 +156,6 @@ Creates a new toggle button with a text label.
 @Returns: 
 
 
-<!-- ##### MACRO gtk_toggle_button_set_state ##### -->
-<para>
-This is a deprecated macro, and is only maintained for compatibility reasons.
-</para>
-
-
-
 <!-- ##### FUNCTION gtk_toggle_button_toggled ##### -->
 <para>
 Emits the <link linkend="GtkToggleButton-toggled">toggled</link>
@@ -178,26 +205,3 @@ This action causes the toggled signal to be emitted.
 @setting: 
 
 
-<!-- ##### SIGNAL GtkToggleButton::toggled ##### -->
-<para>
-Should be connected if you wish to perform an action whenever the
-#GtkToggleButton's state is changed.
-</para>
-
-@togglebutton: the object which received the signal.
-
-<!-- ##### ARG GtkToggleButton:active ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkToggleButton:draw-indicator ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkToggleButton:inconsistent ##### -->
-<para>
-
-</para>
-