From 3d4c43465932742a74c500c7f5e1ba70741b9838 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Thu, 8 Oct 2009 17:55:52 +0200 Subject: [PATCH] Remove deprecated GtkHButtonBox functions and macros --- gtk/gtkbbox.c | 102 -------------------------------------------------- gtk/gtkbbox.h | 37 ------------------ 2 files changed, 139 deletions(-) diff --git a/gtk/gtkbbox.c b/gtk/gtkbbox.c index 6272e0e942..5417be777b 100644 --- a/gtk/gtkbbox.c +++ b/gtk/gtkbbox.c @@ -262,55 +262,6 @@ gtk_button_box_get_child_property (GtkContainer *container, } } -/* set per widget values for spacing, child size and child internal padding */ - -/** - * gtk_button_box_set_child_size: - * @widget: a #GtkButtonBox - * @min_width: a default width for buttons in @widget - * @min_height: a default height for buttons in @widget - * - * Sets a new default size for the children of a given button box. - * - * Deprecated: This is not supported anymore and can only be set through the - * theme changing the style properties: - * "child-min-width" - * and - * "child-min-height" - * instead. - */ -void -gtk_button_box_set_child_size (GtkButtonBox *widget, - gint width, gint height) -{ - g_return_if_fail (GTK_IS_BUTTON_BOX (widget)); - - widget->child_min_width = width; - widget->child_min_height = height; -} - -/** - * gtk_button_box_set_child_ipadding: - * @widget: a #GtkButtonBox - * @ipad_x: the horizontal padding that should be used by each button in @widget - * @ipad_y: the vertical padding that should be used by each button in @widget - * - * Changes the amount of internal padding used by all buttons in a given button - * box. - * - * Deprecated: Use the style properties - * "child-internal-pad-x/-y" instead. - */ -void -gtk_button_box_set_child_ipadding (GtkButtonBox *widget, - gint ipad_x, gint ipad_y) -{ - g_return_if_fail (GTK_IS_BUTTON_BOX (widget)); - - widget->child_ipad_x = ipad_x; - widget->child_ipad_y = ipad_y; -} - /** * gtk_button_box_set_layout: * @widget: a #GtkButtonBox @@ -334,59 +285,6 @@ gtk_button_box_set_layout (GtkButtonBox *widget, } } - -/* get per widget values for spacing, child size and child internal padding */ - -/** - * gtk_button_box_get_child_size: - * @widget: a #GtkButtonBox - * @min_width: the width of the buttons contained by @widget - * @min_height: the height of the buttons contained by @widget - * - * Retrieves the current width and height of all child widgets in a button box. - * @min_width and @min_height are filled with those values, respectively. - * - * Deprecated: Use the style properties - * "child-min-width/-height" instead. - */ -void -gtk_button_box_get_child_size (GtkButtonBox *widget, - gint *width, gint *height) -{ - g_return_if_fail (GTK_IS_BUTTON_BOX (widget)); - g_return_if_fail (width != NULL); - g_return_if_fail (height != NULL); - - *width = widget->child_min_width; - *height = widget->child_min_height; -} - -/** - * gtk_button_box_get_child_ipadding: - * @widget: a #GtkButtonBox - * @ipad_x: the horizontal padding used by buttons in @widget - * @ipad_y: the vertical padding used by buttons in @widget - * - * Gets the default number of pixels that pad the buttons in a given button box. - * - * Deprecated: Use the style properties - * "child-internal-pad-x" - * and - * "child-internal-pad-y" - * instead. - */ -void -gtk_button_box_get_child_ipadding (GtkButtonBox *widget, - gint* ipad_x, gint *ipad_y) -{ - g_return_if_fail (GTK_IS_BUTTON_BOX (widget)); - g_return_if_fail (ipad_x != NULL); - g_return_if_fail (ipad_y != NULL); - - *ipad_x = widget->child_ipad_x; - *ipad_y = widget->child_ipad_y; -} - /** * gtk_button_box_get_layout: * @widget: a #GtkButtonBox diff --git a/gtk/gtkbbox.h b/gtk/gtkbbox.h index 7a2d823e23..26ec7565fc 100644 --- a/gtk/gtkbbox.h +++ b/gtk/gtkbbox.h @@ -76,43 +76,6 @@ void gtk_button_box_set_child_secondary (GtkButtonBox *widget, GtkWidget *child, gboolean is_secondary); -#ifndef GTK_DISABLE_DEPRECATED -/** - * gtk_button_box_set_spacing: - * @b: a #GtkButtonBox - * @s: the number of pixels of spacing - * - * Sets the amount of spacing between buttons in a given button box. - * - * Deprecated: Use gtk_box_set_spacing() instead. - */ -#define gtk_button_box_set_spacing(b,s) gtk_box_set_spacing (GTK_BOX (b), s) - -/** - * gtk_button_box_get_spacing: - * @b: a #GtkButtonBox - * - * Retrieves how much space a button box is placing between each child button. - * - * Deprecated: Use gtk_box_get_spacing() instead. - * Returns: the current spacing applied to the buttons in @widget - */ -#define gtk_button_box_get_spacing(b) gtk_box_get_spacing (GTK_BOX (b)) - -void gtk_button_box_set_child_size (GtkButtonBox *widget, - gint min_width, - gint min_height); -void gtk_button_box_set_child_ipadding (GtkButtonBox *widget, - gint ipad_x, - gint ipad_y); -void gtk_button_box_get_child_size (GtkButtonBox *widget, - gint *min_width, - gint *min_height); -void gtk_button_box_get_child_ipadding (GtkButtonBox *widget, - gint *ipad_x, - gint *ipad_y); -#endif - /* Internal method - do not use. */ void _gtk_button_box_child_requisition (GtkWidget *widget, int *nvis_children,