Commit d86164f9 authored by Tristan Van Berkom's avatar Tristan Van Berkom

Revert "Removed size_request from GtkTextView"

This reverts commit 87dfa724.

I pushed this to the wrong branch, ouch sorry.
parent 2d4f3e13
...@@ -282,12 +282,6 @@ static void gtk_text_view_get_property (GObject *object, ...@@ -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_destroy (GtkWidget *widget);
static void gtk_text_view_size_request (GtkWidget *widget, static void gtk_text_view_size_request (GtkWidget *widget,
GtkRequisition *requisition); 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, static void gtk_text_view_size_allocate (GtkWidget *widget,
GtkAllocation *allocation); GtkAllocation *allocation);
static void gtk_text_view_realize (GtkWidget *widget); static void gtk_text_view_realize (GtkWidget *widget);
...@@ -595,8 +589,7 @@ gtk_text_view_class_init (GtkTextViewClass *klass) ...@@ -595,8 +589,7 @@ gtk_text_view_class_init (GtkTextViewClass *klass)
widget_class->direction_changed = gtk_text_view_direction_changed; widget_class->direction_changed = gtk_text_view_direction_changed;
widget_class->grab_notify = gtk_text_view_grab_notify; widget_class->grab_notify = gtk_text_view_grab_notify;
widget_class->state_changed = gtk_text_view_state_changed; widget_class->state_changed = gtk_text_view_state_changed;
widget_class->get_preferred_width = gtk_text_view_get_preferred_width; widget_class->size_request = gtk_text_view_size_request;
widget_class->get_preferred_height = gtk_text_view_get_preferred_height;
widget_class->size_allocate = gtk_text_view_size_allocate; widget_class->size_allocate = gtk_text_view_size_allocate;
widget_class->event = gtk_text_view_event; widget_class->event = gtk_text_view_event;
widget_class->key_press_event = gtk_text_view_key_press_event; widget_class->key_press_event = gtk_text_view_key_press_event;
...@@ -3312,31 +3305,6 @@ gtk_text_view_size_request (GtkWidget *widget, ...@@ -3312,31 +3305,6 @@ gtk_text_view_size_request (GtkWidget *widget,
priv->cached_size_request = *requisition; 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 static void
gtk_text_view_compute_child_allocation (GtkTextView *text_view, gtk_text_view_compute_child_allocation (GtkTextView *text_view,
GtkTextViewChild *vc, GtkTextViewChild *vc,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment