examples/gtkdial: Do not use size_request vfunc

This commit is contained in:
Javier Jardón 2010-11-11 05:03:06 +01:00 committed by Tristan Van Berkom
parent c68a4ad4f6
commit df5286f11e

View File

@ -33,8 +33,12 @@ static void gtk_dial_class_init (GtkDialClass *klass);
static void gtk_dial_init (GtkDial *dial); static void gtk_dial_init (GtkDial *dial);
static void gtk_dial_destroy (GtkWidget *widget); static void gtk_dial_destroy (GtkWidget *widget);
static void gtk_dial_realize (GtkWidget *widget); static void gtk_dial_realize (GtkWidget *widget);
static void gtk_dial_size_request (GtkWidget *widget, static void gtk_dial_get_preferred_width (GtkWidget *widget,
GtkRequisition *requisition); gint *minimum,
gint *natural);
static void gtk_dial_get_preferred_heigh (GtkWidget *widget,
gint *minimum,
gint *natural);
static void gtk_dial_size_allocate (GtkWidget *widget, static void gtk_dial_size_allocate (GtkWidget *widget,
GtkAllocation *allocation); GtkAllocation *allocation);
static gboolean gtk_dial_expose (GtkWidget *widget, static gboolean gtk_dial_expose (GtkWidget *widget,
@ -96,7 +100,8 @@ gtk_dial_class_init (GtkDialClass *class)
widget_class->destroy = gtk_dial_destroy; widget_class->destroy = gtk_dial_destroy;
widget_class->realize = gtk_dial_realize; widget_class->realize = gtk_dial_realize;
widget_class->expose_event = gtk_dial_expose; widget_class->expose_event = gtk_dial_expose;
widget_class->size_request = gtk_dial_size_request; widget_class->get_preferred_width = gtk_dial_get_preferred_width;
widget_class->get_preferred_height = gtk_dial_get_preferred_height;
widget_class->size_allocate = gtk_dial_size_allocate; widget_class->size_allocate = gtk_dial_size_allocate;
widget_class->button_press_event = gtk_dial_button_press; widget_class->button_press_event = gtk_dial_button_press;
widget_class->button_release_event = gtk_dial_button_release; widget_class->button_release_event = gtk_dial_button_release;
@ -238,11 +243,19 @@ gtk_dial_realize (GtkWidget *widget)
} }
static void static void
gtk_dial_size_request (GtkWidget *widget, gtk_dial_get_preferred_width (GtkWidget *widget,
GtkRequisition *requisition) gint *minimum,
gint *natural);
{ {
requisition->width = DIAL_DEFAULT_SIZE; *minimum = *natural = DIAL_DEFAULT_SIZE;
requisition->height = DIAL_DEFAULT_SIZE; }
static void
gtk_dial_get_preferred_heigh (GtkWidget *widget,
gint *minimum,
gint *natural);
{
*minimum = *natural = DIAL_DEFAULT_SIZE;
} }
static void static void