forked from AuroraMiddleware/gtk
gtkoffscreenbox.c: Replace size_request by get_preferred_width/height
This commit is contained in:
parent
10d5686fe1
commit
f427d6998d
@ -11,8 +11,12 @@
|
||||
|
||||
static void gtk_offscreen_box_realize (GtkWidget *widget);
|
||||
static void gtk_offscreen_box_unrealize (GtkWidget *widget);
|
||||
static void gtk_offscreen_box_size_request (GtkWidget *widget,
|
||||
GtkRequisition *requisition);
|
||||
static void gtk_offscreen_box_get_preferred_width (GtkWidget *widget,
|
||||
gint *minimum,
|
||||
gint *maximum);
|
||||
static void gtk_offscreen_box_get_preferred_height (GtkWidget *widget,
|
||||
gint *minimum,
|
||||
gint *maximum);
|
||||
static void gtk_offscreen_box_size_allocate (GtkWidget *widget,
|
||||
GtkAllocation *allocation);
|
||||
static gboolean gtk_offscreen_box_damage (GtkWidget *widget,
|
||||
@ -119,7 +123,8 @@ gtk_offscreen_box_class_init (GtkOffscreenBoxClass *klass)
|
||||
|
||||
widget_class->realize = gtk_offscreen_box_realize;
|
||||
widget_class->unrealize = gtk_offscreen_box_unrealize;
|
||||
widget_class->size_request = gtk_offscreen_box_size_request;
|
||||
widget_class->get_preferred_width = gtk_offscreen_box_get_preferred_width;
|
||||
widget_class->get_preferred_height = gtk_offscreen_box_get_preferred_height;
|
||||
widget_class->size_allocate = gtk_offscreen_box_size_allocate;
|
||||
widget_class->draw = gtk_offscreen_box_draw;
|
||||
|
||||
@ -517,6 +522,30 @@ gtk_offscreen_box_size_request (GtkWidget *widget,
|
||||
requisition->height = border_width * 2 + h;
|
||||
}
|
||||
|
||||
static void
|
||||
gtk_offscreen_box_get_preferred_width (GtkWidget *widget,
|
||||
gint *minimum,
|
||||
gint *natural)
|
||||
{
|
||||
GtkRequisition requisition;
|
||||
|
||||
gtk_offscreen_box_size_request (widget, &requisition);
|
||||
|
||||
*minimum = *natural = requisition.width;
|
||||
}
|
||||
|
||||
static void
|
||||
gtk_offscreen_box_get_preferred_height (GtkWidget *widget,
|
||||
gint *minimum,
|
||||
gint *natural)
|
||||
{
|
||||
GtkRequisition requisition;
|
||||
|
||||
gtk_offscreen_box_size_request (widget, &requisition);
|
||||
|
||||
*minimum = *natural = requisition.height;
|
||||
}
|
||||
|
||||
static void
|
||||
gtk_offscreen_box_size_allocate (GtkWidget *widget,
|
||||
GtkAllocation *allocation)
|
||||
|
Loading…
Reference in New Issue
Block a user