diff options
| author | Benjamin Otte <otte@redhat.com> | 2013-05-11 15:11:53 +0200 |
|---|---|---|
| committer | Benjamin Otte <otte@redhat.com> | 2013-05-11 15:11:53 +0200 |
| commit | 689905c1b45e3d70931a157994f719e87a7e57ee (patch) | |
| tree | 2b45bfa2c79166e8ee560a0dad61c56bc6a2fc7d | |
| parent | bd4d00918ed6293f7b45921ee4a52068aa78aa44 (diff) | |
| download | gtk+-689905c1b45e3d70931a157994f719e87a7e57ee.tar.gz | |
widget: make gtk_widget_compute_size_for_orientation() static
It's not used anywhere outside of gtksizerequest.c anymore.
| -rw-r--r-- | gtk/gtksizerequest.c | 78 | ||||
| -rw-r--r-- | gtk/gtkwidgetprivate.h | 7 |
2 files changed, 39 insertions, 46 deletions
diff --git a/gtk/gtksizerequest.c b/gtk/gtksizerequest.c index 3bdff2094e..bfcdfbc0cc 100644 --- a/gtk/gtksizerequest.c +++ b/gtk/gtksizerequest.c @@ -358,14 +358,14 @@ gtk_widget_query_size_for_orientation (GtkWidget *widget, * not cached. If the for_size here is -1, then get_preferred_width() * or get_preferred_height() will be used. */ -void -_gtk_widget_compute_size_for_orientation (GtkWidget *widget, - GtkOrientation orientation, - gint for_size, - gint *minimum, - gint *natural, - gint *minimum_baseline, - gint *natural_baseline) +static void +gtk_widget_compute_size_for_orientation (GtkWidget *widget, + GtkOrientation orientation, + gint for_size, + gint *minimum, + gint *natural, + gint *minimum_baseline, + gint *natural_baseline) { GHashTable *widgets; GHashTableIter iter; @@ -487,12 +487,12 @@ gtk_widget_get_preferred_width (GtkWidget *widget, g_return_if_fail (GTK_IS_WIDGET (widget)); g_return_if_fail (minimum_width != NULL || natural_width != NULL); - _gtk_widget_compute_size_for_orientation (widget, - GTK_ORIENTATION_HORIZONTAL, - -1, - minimum_width, - natural_width, - NULL, NULL); + gtk_widget_compute_size_for_orientation (widget, + GTK_ORIENTATION_HORIZONTAL, + -1, + minimum_width, + natural_width, + NULL, NULL); } @@ -522,12 +522,12 @@ gtk_widget_get_preferred_height (GtkWidget *widget, g_return_if_fail (GTK_IS_WIDGET (widget)); g_return_if_fail (minimum_height != NULL || natural_height != NULL); - _gtk_widget_compute_size_for_orientation (widget, - GTK_ORIENTATION_VERTICAL, - -1, - minimum_height, - natural_height, - NULL, NULL); + gtk_widget_compute_size_for_orientation (widget, + GTK_ORIENTATION_VERTICAL, + -1, + minimum_height, + natural_height, + NULL, NULL); } @@ -560,12 +560,12 @@ gtk_widget_get_preferred_width_for_height (GtkWidget *widget, g_return_if_fail (minimum_width != NULL || natural_width != NULL); g_return_if_fail (height >= 0); - _gtk_widget_compute_size_for_orientation (widget, - GTK_ORIENTATION_HORIZONTAL, - height, - minimum_width, - natural_width, - NULL, NULL); + gtk_widget_compute_size_for_orientation (widget, + GTK_ORIENTATION_HORIZONTAL, + height, + minimum_width, + natural_width, + NULL, NULL); } /** @@ -596,12 +596,12 @@ gtk_widget_get_preferred_height_for_width (GtkWidget *widget, g_return_if_fail (minimum_height != NULL || natural_height != NULL); g_return_if_fail (width >= 0); - _gtk_widget_compute_size_for_orientation (widget, - GTK_ORIENTATION_VERTICAL, - width, - minimum_height, - natural_height, - NULL, NULL); + gtk_widget_compute_size_for_orientation (widget, + GTK_ORIENTATION_VERTICAL, + width, + minimum_height, + natural_height, + NULL, NULL); } /** @@ -637,13 +637,13 @@ gtk_widget_get_preferred_height_and_baseline_for_width (GtkWidget *widget, g_return_if_fail (minimum_height != NULL || natural_height != NULL); g_return_if_fail (width >= -1); - _gtk_widget_compute_size_for_orientation (widget, - GTK_ORIENTATION_VERTICAL, - width, - minimum_height, - natural_height, - minimum_baseline, - natural_baseline); + gtk_widget_compute_size_for_orientation (widget, + GTK_ORIENTATION_VERTICAL, + width, + minimum_height, + natural_height, + minimum_baseline, + natural_baseline); } /* diff --git a/gtk/gtkwidgetprivate.h b/gtk/gtkwidgetprivate.h index 7f48a7c562..7aeb444f55 100644 --- a/gtk/gtkwidgetprivate.h +++ b/gtk/gtkwidgetprivate.h @@ -67,13 +67,6 @@ void _gtk_widget_override_size_request (GtkWidget *widget, void _gtk_widget_restore_size_request (GtkWidget *widget, int old_width, int old_height); -void _gtk_widget_compute_size_for_orientation (GtkWidget *widget, - GtkOrientation orientation, - gint for_size, - gint *minimum_size, - gint *natural_size, - gint *minimum_baseline, - gint *natural_baseline); void _gtk_widget_get_preferred_size_for_size (GtkWidget *widget, GtkOrientation orientation, gint size, |