[gtk+/gtk-2-90: 86/161] Remove remaining GtkButtonBox deprecated stuff



commit 79a3cacf13517975de5e403362756c016cdfad13
Author: Javier Jardón <javierjc1982 gmail com>
Date:   Sat Oct 10 19:38:23 2009 +0200

    Remove remaining GtkButtonBox deprecated stuff
    
    This completes commit b1b986cc604bffd924a13fbcb180dd234a0b8d14

 docs/reference/gtk/gtk-sections.txt  |    6 ------
 docs/reference/gtk/tmpl/gtkbbox.sgml |   27 +++------------------------
 docs/tutorial/gtk-tut.sgml           |    1 -
 examples/buttonbox/buttonbox.c       |    1 -
 gtk/gtk.symbols                      |    6 ------
 tests/testgtk.c                      |    5 ++++-
 6 files changed, 7 insertions(+), 39 deletions(-)
---
diff --git a/docs/reference/gtk/gtk-sections.txt b/docs/reference/gtk/gtk-sections.txt
index f71c3e9..b7fd5cf 100644
--- a/docs/reference/gtk/gtk-sections.txt
+++ b/docs/reference/gtk/gtk-sections.txt
@@ -421,15 +421,9 @@ gtk_aspect_frame_get_type
 <TITLE>GtkButtonBox</TITLE>
 GtkButtonBox
 GTK_BUTTONBOX_DEFAULT
-gtk_button_box_get_spacing
 gtk_button_box_get_layout
-gtk_button_box_get_child_size
-gtk_button_box_get_child_ipadding
 gtk_button_box_get_child_secondary
-gtk_button_box_set_spacing
 gtk_button_box_set_layout
-gtk_button_box_set_child_size
-gtk_button_box_set_child_ipadding
 gtk_button_box_set_child_secondary
 <SUBSECTION Standard>
 GTK_BUTTON_BOX
diff --git a/docs/reference/gtk/tmpl/gtkbbox.sgml b/docs/reference/gtk/tmpl/gtkbbox.sgml
index ae4b411..a6f83f2 100644
--- a/docs/reference/gtk/tmpl/gtkbbox.sgml
+++ b/docs/reference/gtk/tmpl/gtkbbox.sgml
@@ -10,9 +10,8 @@ The primary purpose of this class is to keep track of the various properties
 of #GtkHButtonBox and #GtkVButtonBox widgets.
 </para>
 <para>
-gtk_button_box_get_child_size() retrieves the minimum width and height 
-for widgets in a given button box. gtk_button_box_set_child_size() 
-allows those properties to be changed.
+The style properties "child-min-width/-height" store the minimum width and height
+for widgets in a given button box.
 </para>
 <para>
 The internal padding of buttons can be retrieved and changed per button box using
@@ -20,7 +19,7 @@ gtk_button_box_get_child_ipadding() and gtk_button_box_set_child_ipadding()
 respectively.
 </para>
 <para>
-gtk_button_box_get_spacing() and gtk_button_box_set_spacing() retrieve and
+gtk_box_get_spacing() and gtk_box_set_spacing() retrieve and
 change default number of pixels between buttons, respectively.
 </para>
 <para>
@@ -94,16 +93,6 @@ Used internally only.
 
 
 
-<!-- ##### MACRO gtk_button_box_get_spacing ##### -->
-<para>
-Retrieves how much space a button box is placing between each child button.
-</para>
-
- b: a #GtkButtonBox
- Returns: the current spacing applied to the buttons in @widget
- Deprecated: Use gtk_box_get_spacing() instead.
-
-
 <!-- ##### FUNCTION gtk_button_box_get_layout ##### -->
 <para>
 Retrieves the method being used to arrange the buttons in a button box.
@@ -151,16 +140,6 @@ Gets the default number of pixels that pad the buttons in a given button box.
 @Returns: 
 
 
-<!-- ##### MACRO gtk_button_box_set_spacing ##### -->
-<para>
-Sets the amount of spacing between buttons in a given button box.
-</para>
-
- b: a #GtkButtonBox
- s: the number of pixels of spacing
- Deprecated: Use gtk_box_set_spacing() instead.
-
-
 <!-- ##### FUNCTION gtk_button_box_set_layout ##### -->
 <para>
 Changes the way buttons are arranged in their container.
diff --git a/docs/tutorial/gtk-tut.sgml b/docs/tutorial/gtk-tut.sgml
index d140cd0..11407be 100755
--- a/docs/tutorial/gtk-tut.sgml
+++ b/docs/tutorial/gtk-tut.sgml
@@ -7328,7 +7328,6 @@ static GtkWidget *create_bbox( gint  horizontal,
   /* Set the appearance of the Button Box */
   gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), layout);
   gtk_box_set_spacing (GTK_BOX (bbox), spacing);
-  /*gtk_button_box_set_child_size (GTK_BUTTON_BOX (bbox), child_w, child_h);*/
 
   button = gtk_button_new_from_stock (GTK_STOCK_OK);
   gtk_container_add (GTK_CONTAINER (bbox), button);
diff --git a/examples/buttonbox/buttonbox.c b/examples/buttonbox/buttonbox.c
index d48bbfa..1809154 100644
--- a/examples/buttonbox/buttonbox.c
+++ b/examples/buttonbox/buttonbox.c
@@ -26,7 +26,6 @@ static GtkWidget *create_bbox( gint  horizontal,
   /* Set the appearance of the Button Box */
   gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), layout);
   gtk_box_set_spacing (GTK_BOX (bbox), spacing);
-  /*gtk_button_box_set_child_size (GTK_BUTTON_BOX (bbox), child_w, child_h);*/
 
   button = gtk_button_new_from_stock (GTK_STOCK_OK);
   gtk_container_add (GTK_CONTAINER (bbox), button);
diff --git a/gtk/gtk.symbols b/gtk/gtk.symbols
index 630148e..9a0d10c 100644
--- a/gtk/gtk.symbols
+++ b/gtk/gtk.symbols
@@ -492,12 +492,6 @@ gtk_builder_value_from_string_type
 
 #if IN_HEADER(__GTK_BUTTON_BOX_H__)
 #if IN_FILE(__GTK_BUTTON_BOX_C__)
-#ifndef GTK_DISABLE_DEPRECATED
-gtk_button_box_set_child_size
-gtk_button_box_set_child_ipadding
-gtk_button_box_get_child_ipadding
-gtk_button_box_get_child_size
-#endif
 gtk_button_box_get_child_secondary
 gtk_button_box_get_layout
 gtk_button_box_get_type G_GNUC_CONST
diff --git a/tests/testgtk.c b/tests/testgtk.c
index bfe5734..59e3eb1 100644
--- a/tests/testgtk.c
+++ b/tests/testgtk.c
@@ -1232,7 +1232,10 @@ create_bbox (gint  horizontal,
 
   gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), layout);
   gtk_box_set_spacing (GTK_BOX (bbox), spacing);
-  gtk_button_box_set_child_size (GTK_BUTTON_BOX (bbox), child_w, child_h);
+  g_object_set (bbox,
+                "child-min-width", child_w,
+                "child-min-height", child_h,
+                NULL);
   
   button = gtk_button_new_with_label ("OK");
   gtk_container_add (GTK_CONTAINER (bbox), button);



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]