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

menushell: don't call gtk_style_context_set_background()

Browse Source
This commit is contained in:
Cosimo Cecchi 2015-06-03 18:21:16 -07:00
parent 828db3eca9
commit b7be29390f
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gtk/gtkmenushell.c
View File

@ -66,6 +66,7 @@
#include "gtkmenuitemprivate.h" #include "gtkmenuitemprivate.h"
#include "gtkmenushellprivate.h" #include "gtkmenushellprivate.h"
#include "gtkmnemonichash.h" #include "gtkmnemonichash.h"
#include "gtkrender.h"
#include "gtkwindow.h" #include "gtkwindow.h"
#include "gtkwindowprivate.h" #include "gtkwindowprivate.h"
#include "gtkprivate.h" #include "gtkprivate.h"
@ -133,6 +134,8 @@ static void gtk_menu_shell_screen_changed (GtkWidget *widget,
GdkScreen *previous_screen); GdkScreen *previous_screen);
static gboolean gtk_menu_shell_grab_broken (GtkWidget *widget, static gboolean gtk_menu_shell_grab_broken (GtkWidget *widget,
GdkEventGrabBroken *event); GdkEventGrabBroken *event);
static gboolean gtk_menu_shell_draw (GtkWidget *widget,
cairo_t *cr);
static void gtk_menu_shell_add (GtkContainer *container, static void gtk_menu_shell_add (GtkContainer *container,
GtkWidget *widget); GtkWidget *widget);
static void gtk_menu_shell_remove (GtkContainer *container, static void gtk_menu_shell_remove (GtkContainer *container,
@ -198,6 +201,7 @@ gtk_menu_shell_class_init (GtkMenuShellClass *klass)
widget_class->enter_notify_event = gtk_menu_shell_enter_notify; widget_class->enter_notify_event = gtk_menu_shell_enter_notify;
widget_class->leave_notify_event = gtk_menu_shell_leave_notify; widget_class->leave_notify_event = gtk_menu_shell_leave_notify;
widget_class->screen_changed = gtk_menu_shell_screen_changed; widget_class->screen_changed = gtk_menu_shell_screen_changed;
widget_class->draw = gtk_menu_shell_draw;
container_class->add = gtk_menu_shell_add; container_class->add = gtk_menu_shell_add;
container_class->remove = gtk_menu_shell_remove; container_class->remove = gtk_menu_shell_remove;
@ -585,7 +589,6 @@ gtk_menu_shell_realize (GtkWidget *widget)
GdkWindow *window; GdkWindow *window;
GdkWindowAttr attributes; GdkWindowAttr attributes;
gint attributes_mask; gint attributes_mask;
GtkStyleContext *context;
gtk_widget_set_realized (widget, TRUE); gtk_widget_set_realized (widget, TRUE);
@ -613,9 +616,18 @@ gtk_menu_shell_realize (GtkWidget *widget)
&attributes, attributes_mask); &attributes, attributes_mask);
gtk_widget_set_window (widget, window); gtk_widget_set_window (widget, window);
gtk_widget_register_window (widget, window); gtk_widget_register_window (widget, window);
}
context = gtk_widget_get_style_context (widget); static gboolean
gtk_style_context_set_background (context, window); gtk_menu_shell_draw (GtkWidget *widget,
cairo_t *cr)
{
gtk_render_background (gtk_widget_get_style_context (widget), cr,
0, 0,
gtk_widget_get_allocated_width (widget),
gtk_widget_get_allocated_height (widget));
return GTK_WIDGET_CLASS (gtk_menu_shell_parent_class)->draw (widget, cr);
} }
static void static void