GtkRequisition *requisition);
static void gtk_menu_bar_size_allocate (GtkWidget *widget,
GtkAllocation *allocation);
-static void gtk_menu_bar_paint (GtkWidget *widget);
+static void gtk_menu_bar_paint (GtkWidget *widget,
+ GdkRectangle *area);
static void gtk_menu_bar_draw (GtkWidget *widget,
GdkRectangle *area);
static gint gtk_menu_bar_expose (GtkWidget *widget,
}
static void
-gtk_menu_bar_paint (GtkWidget *widget)
+gtk_menu_bar_paint (GtkWidget *widget, GdkRectangle *area)
{
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_MENU_BAR (widget));
if (GTK_WIDGET_DRAWABLE (widget))
{
- gtk_draw_shadow (widget->style,
- widget->window,
- GTK_STATE_NORMAL,
- GTK_SHADOW_OUT,
- 0, 0,
- widget->allocation.width,
- widget->allocation.height);
+ gtk_paint_box (widget->style,
+ widget->window,
+ GTK_STATE_NORMAL,
+ GTK_SHADOW_OUT,
+ area, widget, "menubar",
+ 0, 0,
+ -1,-1);
}
}
if (GTK_WIDGET_DRAWABLE (widget))
{
- gtk_menu_bar_paint (widget);
+ gtk_menu_bar_paint (widget, area);
menu_shell = GTK_MENU_SHELL (widget);
GdkEventExpose *event)
{
GtkMenuShell *menu_shell;
- GtkWidget *child;
GdkEventExpose child_event;
GList *children;
+ GtkWidget *child;
g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GTK_IS_MENU_BAR (widget), FALSE);
if (GTK_WIDGET_DRAWABLE (widget))
{
- gtk_menu_bar_paint (widget);
+ gtk_menu_bar_paint (widget, &event->area);
menu_shell = GTK_MENU_SHELL (widget);
child_event = *event;