[gtk+/treeview-refactor] Revert "Removed size_request from GtkTextView"
- From: Tristan Van Berkom <tvb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/treeview-refactor] Revert "Removed size_request from GtkTextView"
- Date: Sat, 30 Oct 2010 08:34:32 +0000 (UTC)
commit d86164f90dc0df9f08892558ebc1121e9960ad40
Author: Tristan Van Berkom <tristan van berkom gmail com>
Date: Thu Oct 28 01:40:51 2010 +0900
Revert "Removed size_request from GtkTextView"
This reverts commit 87dfa724ebb4e8710bee17461cb4823ba66d8658.
I pushed this to the wrong branch, ouch sorry.
gtk/gtktextview.c | 34 +---------------------------------
1 files changed, 1 insertions(+), 33 deletions(-)
---
diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index 4e6d372..27c21d0 100644
--- 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;
@@ -3313,31 +3306,6 @@ 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)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]