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

eventbox: Merge paint function into expose function

Browse Source
This commit is contained in:
Benjamin Otte 2010-09-07 19:29:03 +02:00
parent ce2d6cc015
commit d17ba1d30a
1 changed files with 10 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
gtk/gtkeventbox.c
View File

@ -57,8 +57,6 @@ static void gtk_event_box_size_request (GtkWidget *widget,
GtkRequisition *requisition); GtkRequisition *requisition);
static void gtk_event_box_size_allocate (GtkWidget *widget, static void gtk_event_box_size_allocate (GtkWidget *widget,
GtkAllocation *allocation); GtkAllocation *allocation);
static void gtk_event_box_paint (GtkWidget *widget,
GdkRectangle *area);
static gboolean gtk_event_box_expose (GtkWidget *widget, static gboolean gtk_event_box_expose (GtkWidget *widget,
GdkEventExpose *event); GdkEventExpose *event);
static void gtk_event_box_set_property (GObject *object, static void gtk_event_box_set_property (GObject *object,
@ -564,30 +562,20 @@ gtk_event_box_size_allocate (GtkWidget *widget,
gtk_widget_size_allocate (child, &child_allocation); gtk_widget_size_allocate (child, &child_allocation);
} }
static void
gtk_event_box_paint (GtkWidget *widget,
GdkRectangle *area)
{
if (!gtk_widget_get_app_paintable (widget))
gtk_paint_flat_box (gtk_widget_get_style (widget),
gtk_widget_get_window (widget),
gtk_widget_get_state (widget),
GTK_SHADOW_NONE,
area, widget, "eventbox",
0, 0, -1, -1);
}
static gboolean static gboolean
gtk_event_box_expose (GtkWidget *widget, gtk_event_box_expose (GtkWidget *widget,
GdkEventExpose *event) GdkEventExpose *event)
{ {
if (gtk_widget_is_drawable (widget)) if (gtk_widget_get_has_window (widget) &&
{ !gtk_widget_get_app_paintable (widget))
if (gtk_widget_get_has_window (widget)) gtk_paint_flat_box (gtk_widget_get_style (widget),
gtk_event_box_paint (widget, &event->area); gtk_widget_get_window (widget),
gtk_widget_get_state (widget),
GTK_WIDGET_CLASS (gtk_event_box_parent_class)->expose_event (widget, event); GTK_SHADOW_NONE,
} &event->area, widget, "eventbox",
0, 0, -1, -1);
GTK_WIDGET_CLASS (gtk_event_box_parent_class)->expose_event (widget, event);
return FALSE; return FALSE;
} }