Revert "Removed size_request from GtkTextView"

This reverts commit 87dfa724ebb4e8710bee17461cb4823ba66d8658.

I pushed this to the wrong branch, ouch sorry.

diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index 4e6d37218f03c407e48776e33c5f7c719575a5a4..27c21d0edd02258a59052c6d96818acfcda3b0bb 100644 (file)
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -282,12 +282,6 @@ static void gtk_text_view_get_property         (GObject         *object,
 static void gtk_text_view_destroy              (GtkWidget        *widget);
 static void gtk_text_view_size_request         (GtkWidget        *widget,
                                                 GtkRequisition   *requisition);
-static void gtk_text_view_get_preferred_width  (GtkWidget        *widget,
-                                               gint             *minimum,
-                                               gint             *natural);
-static void gtk_text_view_get_preferred_height (GtkWidget        *widget,
-                                               gint             *minimum,
-                                               gint             *natural);
 static void gtk_text_view_size_allocate        (GtkWidget        *widget,
                                                 GtkAllocation    *allocation);
 static void gtk_text_view_realize              (GtkWidget        *widget);
@@ -595,8 +589,7 @@ gtk_text_view_class_init (GtkTextViewClass *klass)
   widget_class->direction_changed = gtk_text_view_direction_changed;
   widget_class->grab_notify = gtk_text_view_grab_notify;
   widget_class->state_changed = gtk_text_view_state_changed;
-  widget_class->get_preferred_width = gtk_text_view_get_preferred_width;
-  widget_class->get_preferred_height = gtk_text_view_get_preferred_height;
+  widget_class->size_request = gtk_text_view_size_request;
   widget_class->size_allocate = gtk_text_view_size_allocate;
   widget_class->event = gtk_text_view_event;
   widget_class->key_press_event = gtk_text_view_key_press_event;
@@ -3312,31 +3305,6 @@ gtk_text_view_size_request (GtkWidget      *widget,
   priv->cached_size_request = *requisition;
 }
 
-static void
-gtk_text_view_get_preferred_width (GtkWidget *widget,
-                                  gint      *minimum,
-                                  gint      *natural)
-{
-  GtkRequisition requisition;
-
-  gtk_text_view_size_request (widget, &requisition);
-
-  *minimum = *natural = requisition.width;
-}
-
-static void
-gtk_text_view_get_preferred_height (GtkWidget *widget,
-                                   gint      *minimum,
-                                   gint      *natural)
-{
-  GtkRequisition requisition;
-
-  gtk_text_view_size_request (widget, &requisition);
-
-  *minimum = *natural = requisition.height;
-}
-
-
 static void
 gtk_text_view_compute_child_allocation (GtkTextView      *text_view,
                                         GtkTextViewChild *vc,