From b708fc4c143ee3200442ad84ee9ed3db8c513a2d Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Tue, 9 Apr 2013 11:20:49 +0200 Subject: [PATCH] window: Remove an unused function. Luckily, we don't need to support an implementation of a minimal WM for linux-fb anymore (which is what this function was added for). --- gtk/gtkwindow.c | 31 +------------------------------ gtk/gtkwindowprivate.h | 5 ----- 2 files changed, 1 insertion(+), 35 deletions(-) diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c index 9eda8c9eab..12e0f39779 100644 --- a/gtk/gtkwindow.c +++ b/gtk/gtkwindow.c @@ -5124,6 +5124,7 @@ gtk_window_guess_default_size (GtkWindow *window, info = gtk_window_get_geometry_info (window, FALSE); if (info) { + g_print ("last geometry info was %d %d\n", info->last.configure_request.width, info->last.configure_request.height); /* MAX() works even if the last request is unset with -1 */ *width = MAX (*width, info->last.configure_request.width); *height = MAX (*height, info->last.configure_request.height); @@ -7335,36 +7336,6 @@ gtk_window_compare_hints (GdkGeometry *geometry_a, return TRUE; } -void -_gtk_window_constrain_size (GtkWindow *window, - gint width, - gint height, - gint *new_width, - gint *new_height) -{ - GtkWindowPrivate *priv; - GtkWindowGeometryInfo *info; - - g_return_if_fail (GTK_IS_WINDOW (window)); - - priv = window->priv; - - info = priv->geometry_info; - if (info) - { - GdkWindowHints flags = info->last.flags; - GdkGeometry *geometry = &info->last.geometry; - - gtk_window_constrain_size (window, - geometry, - flags, - width, - height, - new_width, - new_height); - } -} - static void gtk_window_constrain_size (GtkWindow *window, GdkGeometry *geometry, diff --git a/gtk/gtkwindowprivate.h b/gtk/gtkwindowprivate.h index 4bfeca7a46..d49dbee629 100644 --- a/gtk/gtkwindowprivate.h +++ b/gtk/gtkwindowprivate.h @@ -30,11 +30,6 @@ void _gtk_window_internal_set_focus (GtkWindow *window, void _gtk_window_reposition (GtkWindow *window, gint x, gint y); -void _gtk_window_constrain_size (GtkWindow *window, - gint width, - gint height, - gint *new_width, - gint *new_height); void _gtk_window_group_add_grab (GtkWindowGroup *window_group, GtkWidget *widget); void _gtk_window_group_remove_grab (GtkWindowGroup *window_group,