AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

combobox: Port to draw vfunc

Browse Source
This commit is contained in:
Benjamin Otte 2010-09-07 20:17:39 +02:00
parent fe4c61b1ec
commit 1f640d127e
1 changed files with 19 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
gtk/gtkcombobox.c
View File

@ -286,8 +286,8 @@ static void gtk_combo_box_forall (GtkContainer *container,
gboolean include_internals, gboolean include_internals,
GtkCallback callback, GtkCallback callback,
gpointer callback_data); gpointer callback_data);
static gboolean gtk_combo_box_expose_event (GtkWidget *widget, static gboolean gtk_combo_box_draw (GtkWidget *widget,
GdkEventExpose *event); cairo_t *cr);
static gboolean gtk_combo_box_scroll_event (GtkWidget *widget, static gboolean gtk_combo_box_scroll_event (GtkWidget *widget,
GdkEventScroll *event); GdkEventScroll *event);
static void gtk_combo_box_set_active_internal (GtkComboBox *combo_box, static void gtk_combo_box_set_active_internal (GtkComboBox *combo_box,
@ -514,7 +514,7 @@ gtk_combo_box_class_init (GtkComboBoxClass *klass)
widget_class = (GtkWidgetClass *)klass; widget_class = (GtkWidgetClass *)klass;
widget_class->size_allocate = gtk_combo_box_size_allocate; widget_class->size_allocate = gtk_combo_box_size_allocate;
widget_class->expose_event = gtk_combo_box_expose_event; widget_class->draw = gtk_combo_box_draw;
widget_class->scroll_event = gtk_combo_box_scroll_event; widget_class->scroll_event = gtk_combo_box_scroll_event;
widget_class->mnemonic_activate = gtk_combo_box_mnemonic_activate; widget_class->mnemonic_activate = gtk_combo_box_mnemonic_activate;
widget_class->grab_focus = gtk_combo_box_grab_focus; widget_class->grab_focus = gtk_combo_box_grab_focus;
@ -2486,39 +2486,35 @@ gtk_combo_box_child_hide (GtkWidget *widget,
} }
static gboolean static gboolean
gtk_combo_box_expose_event (GtkWidget *widget, gtk_combo_box_draw (GtkWidget *widget,
GdkEventExpose *event) cairo_t *cr)
{ {
GtkComboBox *combo_box = GTK_COMBO_BOX (widget); GtkComboBox *combo_box = GTK_COMBO_BOX (widget);
GtkComboBoxPrivate *priv = combo_box->priv; GtkComboBoxPrivate *priv = combo_box->priv;
if (gtk_widget_is_drawable (widget) && if (priv->shadow_type != GTK_SHADOW_NONE)
GTK_SHADOW_NONE != priv->shadow_type)
{ {
GtkAllocation allocation; gtk_cairo_paint_shadow (gtk_widget_get_style (widget),
cr,
gtk_widget_get_allocation (widget, &allocation);
gtk_paint_shadow (gtk_widget_get_style (widget),
gtk_widget_get_window (widget),
GTK_STATE_NORMAL, priv->shadow_type, GTK_STATE_NORMAL, priv->shadow_type,
NULL, widget, "combobox", widget, "combobox",
allocation.x, allocation.y, 0, 0,
allocation.width, allocation.height); gtk_widget_get_allocated_width (widget),
gtk_widget_get_allocated_height (widget));
} }
gtk_container_propagate_expose (GTK_CONTAINER (widget), gtk_container_propagate_draw (GTK_CONTAINER (widget),
priv->button, event); priv->button, cr);
if (priv->tree_view && priv->cell_view_frame) if (priv->tree_view && priv->cell_view_frame)
{ {
gtk_container_propagate_expose (GTK_CONTAINER (widget), gtk_container_propagate_draw (GTK_CONTAINER (widget),
priv->cell_view_frame, event); priv->cell_view_frame, cr);
} }
gtk_container_propagate_expose (GTK_CONTAINER (widget), gtk_container_propagate_draw (GTK_CONTAINER (widget),
gtk_bin_get_child (GTK_BIN (widget)), gtk_bin_get_child (GTK_BIN (widget)),
event); cr);
return FALSE; return FALSE;
} }