diff options
| author | Tristan Van Berkom <tristan.van.berkom@gmail.com> | 2010-10-27 23:25:05 +0900 |
|---|---|---|
| committer | Tristan Van Berkom <tristan.van.berkom@gmail.com> | 2010-10-27 23:25:05 +0900 |
| commit | 1132f54dcca0fe65ae5ef3896c12a955b3e42a3b (patch) | |
| tree | 8fae1710ebbceeeebbd78313fbaeb6876f852da9 | |
| parent | 8f9807ac15cd416a93dbd69c2fcf0e826876af2d (diff) | |
| download | gtk+-1132f54dcca0fe65ae5ef3896c12a955b3e42a3b.tar.gz | |
Removing size_request from GtkTextView
| -rw-r--r-- | gtk/gtktextview.c | 34 |
1 files changed, 33 insertions, 1 deletions
diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c index ae12071c89..b4cf053f81 100644 --- a/gtk/gtktextview.c +++ b/gtk/gtktextview.c @@ -282,6 +282,12 @@ 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); @@ -589,7 +595,8 @@ 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->size_request = gtk_text_view_size_request; + 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_allocate = gtk_text_view_size_allocate; widget_class->event = gtk_text_view_event; widget_class->key_press_event = gtk_text_view_key_press_event; @@ -3306,6 +3313,31 @@ gtk_text_view_size_request (GtkWidget *widget, } 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, GtkAllocation *allocation) |