[gtk+/wip/queue-resize: 2/3] widget: Remove _gtk_widget_override_size_request()



commit 6141b3f9f29f5ca3dc2a8165575bf86b4ed6caa7
Author: Benjamin Otte <otte redhat com>
Date:   Tue Mar 24 04:37:26 2015 +0100

    widget: Remove _gtk_widget_override_size_request()
    
    The function was only used by the geometry widget.

 gtk/gtkwidget.c        |   46 ----------------------------------------------
 gtk/gtkwidgetprivate.h |    8 --------
 2 files changed, 0 insertions(+), 54 deletions(-)
---
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 1545441..348a9de 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -11081,52 +11081,6 @@ gtk_widget_get_size_request (GtkWidget *widget,
 }
 
 /**
- * _gtk_widget_override_size_request:
- * @widget: a #GtkWidget
- * @width: new forced minimum width
- * @height: new forced minimum height
- * @old_width: location to store previous forced minimum width
- * @old_height: location to store previous forced minumum height
- *
- * Temporarily establishes a forced minimum size for a widget; this
- * is used by GtkWindow when calculating the size to add to the
- * window’s geometry widget. Cached sizes for the widget and its
- * parents are invalidated, so that subsequent calls to the size
- * negotiation machinery produce the overriden result, but the
- * widget is not queued for relayout or redraw. The old size must
- * be restored with _gtk_widget_restore_size_request() or things
- * will go screwy.
- */
-void
-_gtk_widget_override_size_request (GtkWidget *widget,
-                                  int        width,
-                                  int        height,
-                                  int       *old_width,
-                                  int       *old_height)
-{
-  gtk_widget_get_size_request (widget, old_width, old_height);
-  gtk_widget_set_usize_internal (widget, width, height,
-                                GTK_QUEUE_RESIZE_INVALIDATE_ONLY);
-}
-
-/**
- * _gtk_widget_restore_size_request:
- * @widget: a #GtkWidget
- * @old_width: saved forced minimum size
- * @old_height: saved forced minimum size
- *
- * Undoes the operation of_gtk_widget_override_size_request().
- */
-void
-_gtk_widget_restore_size_request (GtkWidget *widget,
-                                 int        old_width,
-                                 int        old_height)
-{
-  gtk_widget_set_usize_internal (widget, old_width, old_height,
-                                GTK_QUEUE_RESIZE_INVALIDATE_ONLY);
-}
-
-/**
  * gtk_widget_set_events:
  * @widget: a #GtkWidget
  * @events: event mask
diff --git a/gtk/gtkwidgetprivate.h b/gtk/gtkwidgetprivate.h
index 95b7bb1..a537e70 100644
--- a/gtk/gtkwidgetprivate.h
+++ b/gtk/gtkwidgetprivate.h
@@ -63,14 +63,6 @@ void         _gtk_widget_add_attached_window    (GtkWidget    *widget,
 void         _gtk_widget_remove_attached_window (GtkWidget    *widget,
                                                  GtkWindow    *window);
 
-void _gtk_widget_override_size_request (GtkWidget *widget,
-                                        int        width,
-                                        int        height,
-                                        int       *old_width,
-                                        int       *old_height);
-void _gtk_widget_restore_size_request  (GtkWidget *widget,
-                                        int        old_width,
-                                        int        old_height);
 void _gtk_widget_get_preferred_size_for_size   (GtkWidget         *widget,
                                                 GtkOrientation     orientation,
                                                 gint               size,


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