callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tearoffmenuitem: Merge paint() into expose()

Browse Source
This commit is contained in:
Benjamin Otte 2010-09-07 22:12:33 +02:00
parent 6f6c81e527
commit d992df0a47
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gtk/gtktearoffmenuitem.c
View File

@ -41,7 +41,7 @@ struct _GtkTearoffMenuItemPrivate
static void gtk_tearoff_menu_item_size_request (GtkWidget *widget, static void gtk_tearoff_menu_item_size_request (GtkWidget *widget,
GtkRequisition *requisition); GtkRequisition *requisition);
static gint gtk_tearoff_menu_item_expose (GtkWidget *widget, static gboolean gtk_tearoff_menu_item_expose (GtkWidget *widget,
GdkEventExpose *event); GdkEventExpose *event);
static void gtk_tearoff_menu_item_activate (GtkMenuItem *menu_item); static void gtk_tearoff_menu_item_activate (GtkMenuItem *menu_item);
static void gtk_tearoff_menu_item_parent_set (GtkWidget *widget, static void gtk_tearoff_menu_item_parent_set (GtkWidget *widget,
@ -111,9 +111,9 @@ gtk_tearoff_menu_item_size_request (GtkWidget *widget,
} }
} }
static void static gboolean
gtk_tearoff_menu_item_paint (GtkWidget *widget, gtk_tearoff_menu_item_expose (GtkWidget *widget,
GdkRectangle *area) GdkEventExpose *event)
{ {
GtkAllocation allocation; GtkAllocation allocation;
GtkMenuItem *menu_item; GtkMenuItem *menu_item;
@ -158,7 +158,7 @@ gtk_tearoff_menu_item_paint (GtkWidget *widget,
window, window,
GTK_STATE_PRELIGHT, GTK_STATE_PRELIGHT,
selected_shadow_type, selected_shadow_type,
area, widget, "menuitem", &event->area, widget, "menuitem",
x, y, width, height); x, y, width, height);
} }
else else
@ -227,13 +227,6 @@ gtk_tearoff_menu_item_paint (GtkWidget *widget,
x += 2 * TEAR_LENGTH; x += 2 * TEAR_LENGTH;
} }
} }
}
static gint
gtk_tearoff_menu_item_expose (GtkWidget *widget,
GdkEventExpose *event)
{
gtk_tearoff_menu_item_paint (widget, &event->area);
return FALSE; return FALSE;
} }