diff options
| author | Tim Janik <timj@gtk.org> | 1998-07-17 00:03:35 +0000 |
|---|---|---|
| committer | Tim Janik <timj@src.gnome.org> | 1998-07-17 00:03:35 +0000 |
| commit | ca17982ed272888a5120db6951ad15e216596e30 (patch) | |
| tree | 7a1fd041b6e3e504135322917d3a6835dc985e60 /gtk/gtkwidget.c | |
| parent | 699dcbab17cb1525c065323dc9fb549ec8704c78 (diff) | |
| download | gdk-pixbuf-ca17982ed272888a5120db6951ad15e216596e30.tar.gz | |
use misc->xpad for x calculation instead of ypad (typo). (gtk_arrow_set):
Fri Jul 17 01:21:32 1998 Tim Janik <timj@gtk.org>
* gtk/gtkarrow.c (gtk_arrow_expose): use misc->xpad for x calculation
instead of ypad (typo).
(gtk_arrow_set): clear all of the arrow's allocation (left a 1 pixel
border around the allocation).
(gtk_arrow_init): the static requisition needs to be setup in this
function rather than gtk_widget_new(), so arrow creation works without
the gtk_arrow_new() constructing.
(gtk_arrow_expose): return TRUE, since we actually handled the expose.
* gtk/gtkwidget.c (gtk_widget_real_size_request): provide a default
implementation for GtkWidget::size_request, so size requisition for
simple statically sized widgets like GtkArrow works.
Diffstat (limited to 'gtk/gtkwidget.c')
| -rw-r--r-- | gtk/gtkwidget.c | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c index 72ecdb322..d19896353 100644 --- a/gtk/gtkwidget.c +++ b/gtk/gtkwidget.c @@ -183,6 +183,8 @@ static void gtk_widget_real_realize (GtkWidget *widget); static void gtk_widget_real_unrealize (GtkWidget *widget); static void gtk_widget_real_draw (GtkWidget *widget, GdkRectangle *area); +static void gtk_widget_real_size_request (GtkWidget *widget, + GtkRequisition *requisition); static void gtk_widget_real_size_allocate (GtkWidget *widget, GtkAllocation *allocation); static gint gtk_widget_real_key_press_event (GtkWidget *widget, @@ -718,7 +720,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) klass->unrealize = gtk_widget_real_unrealize; klass->draw = gtk_widget_real_draw; klass->draw_focus = NULL; - klass->size_request = NULL; + klass->size_request = gtk_widget_real_size_request; klass->size_allocate = gtk_widget_real_size_allocate; klass->state_changed = NULL; klass->parent_set = NULL; @@ -3839,13 +3841,16 @@ gtk_widget_real_draw (GtkWidget *widget, } } -/***************************************** - * gtk_widget_real_size_allocate: - * - * arguments: - * - * results: - *****************************************/ +static void +gtk_widget_real_size_request (GtkWidget *widget, + GtkRequisition *requisition) +{ + g_return_if_fail (widget != NULL); + g_return_if_fail (GTK_IS_WIDGET (widget)); + + requisition->width = widget->requisition.width; + requisition->height = widget->requisition.height; +} static void gtk_widget_real_size_allocate (GtkWidget *widget, |