AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-10-01 11:37:35 +00:00
Code Issues Projects Releases Wiki Activity

layout: Port to draw vfunc

Browse Source
This commit is contained in:
Benjamin Otte 2010-09-06 19:30:22 +02:00
parent 8fc35150a2
commit 782af63273
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gtk/gtklayout.c
View File

@ -103,8 +103,8 @@ static void gtk_layout_size_request (GtkWidget *widget,
GtkRequisition *requisition); GtkRequisition *requisition);
static void gtk_layout_size_allocate (GtkWidget *widget, static void gtk_layout_size_allocate (GtkWidget *widget,
GtkAllocation *allocation); GtkAllocation *allocation);
static gint gtk_layout_expose (GtkWidget *widget, static gint gtk_layout_draw (GtkWidget *widget,
GdkEventExpose *event); cairo_t *cr);
static void gtk_layout_add (GtkContainer *container, static void gtk_layout_add (GtkContainer *container,
GtkWidget *widget); GtkWidget *widget);
static void gtk_layout_remove (GtkContainer *container, static void gtk_layout_remove (GtkContainer *container,
@ -660,7 +660,7 @@ gtk_layout_class_init (GtkLayoutClass *class)
widget_class->map = gtk_layout_map; widget_class->map = gtk_layout_map;
widget_class->size_request = gtk_layout_size_request; widget_class->size_request = gtk_layout_size_request;
widget_class->size_allocate = gtk_layout_size_allocate; widget_class->size_allocate = gtk_layout_size_allocate;
widget_class->expose_event = gtk_layout_expose; widget_class->draw = gtk_layout_draw;
widget_class->style_set = gtk_layout_style_set; widget_class->style_set = gtk_layout_style_set;
container_class->add = gtk_layout_add; container_class->add = gtk_layout_add;
@ -1042,17 +1042,15 @@ gtk_layout_size_allocate (GtkWidget *widget,
gtk_layout_set_adjustment_upper (priv->vadjustment, MAX (allocation->height, priv->height), TRUE); gtk_layout_set_adjustment_upper (priv->vadjustment, MAX (allocation->height, priv->height), TRUE);
} }
static gint static gboolean
gtk_layout_expose (GtkWidget *widget, gtk_layout_draw (GtkWidget *widget,
GdkEventExpose *event) cairo_t *cr)
{ {
GtkLayout *layout = GTK_LAYOUT (widget); GtkLayout *layout = GTK_LAYOUT (widget);
GtkLayoutPrivate *priv = layout->priv; GtkLayoutPrivate *priv = layout->priv;
if (event->window != priv->bin_window) if (gtk_cairo_should_draw_window (cr, priv->bin_window))
return FALSE; GTK_WIDGET_CLASS (gtk_layout_parent_class)->draw (widget, cr);
GTK_WIDGET_CLASS (gtk_layout_parent_class)->expose_event (widget, event);
return FALSE; return FALSE;
} }