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

plug: don't call gtk_style_context_set_background()

Browse Source
This commit is contained in:
Cosimo Cecchi 2015-06-05 15:37:34 -07:00
parent b4ee73a291
commit 18be2d697c
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gtk/gtkplug.c
View File

@ -32,6 +32,7 @@
#include "gtkplug.h" #include "gtkplug.h"
#include "gtkintl.h" #include "gtkintl.h"
#include "gtkprivate.h" #include "gtkprivate.h"
#include "gtkrender.h"
#include "gtksocketprivate.h" #include "gtksocketprivate.h"
#include "gtkwidgetprivate.h" #include "gtkwidgetprivate.h"
#include "gtkwindowgroup.h" #include "gtkwindowgroup.h"
@ -92,6 +93,8 @@ static void gtk_plug_show (GtkWidget *widget)
static void gtk_plug_hide (GtkWidget *widget); static void gtk_plug_hide (GtkWidget *widget);
static void gtk_plug_map (GtkWidget *widget); static void gtk_plug_map (GtkWidget *widget);
static void gtk_plug_unmap (GtkWidget *widget); static void gtk_plug_unmap (GtkWidget *widget);
static gboolean gtk_plug_draw (GtkWidget *widget,
cairo_t *cr);
static gboolean gtk_plug_key_press_event (GtkWidget *widget, static gboolean gtk_plug_key_press_event (GtkWidget *widget,
GdkEventKey *event); GdkEventKey *event);
static gboolean gtk_plug_focus_event (GtkWidget *widget, static gboolean gtk_plug_focus_event (GtkWidget *widget,
@ -175,7 +178,7 @@ gtk_plug_class_init (GtkPlugClass *class)
widget_class->hide = gtk_plug_hide; widget_class->hide = gtk_plug_hide;
widget_class->map = gtk_plug_map; widget_class->map = gtk_plug_map;
widget_class->unmap = gtk_plug_unmap; widget_class->unmap = gtk_plug_unmap;
widget_class->draw = gtk_plug_draw;
widget_class->focus = gtk_plug_focus; widget_class->focus = gtk_plug_focus;
gtk_widget_class_set_accessible_role (widget_class, ATK_ROLE_PANEL); gtk_widget_class_set_accessible_role (widget_class, ATK_ROLE_PANEL);
@ -693,6 +696,18 @@ gtk_plug_unrealize (GtkWidget *widget)
GTK_WIDGET_CLASS (gtk_plug_parent_class)->unrealize (widget); GTK_WIDGET_CLASS (gtk_plug_parent_class)->unrealize (widget);
} }
static gboolean
gtk_plug_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_plug_parent_class)->draw (widget, cr);
}
static void static void
xembed_set_info (GdkWindow *window, xembed_set_info (GdkWindow *window,
unsigned long flags) unsigned long flags)
@ -1095,9 +1110,6 @@ gtk_plug_realize (GtkWidget *widget)
} }
gtk_widget_register_window (widget, gdk_window); gtk_widget_register_window (widget, gdk_window);
gtk_style_context_set_background (gtk_widget_get_style_context (widget),
gdk_window);
} }
static void static void