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

socket: don't call gtk_style_context_set_background()

Browse Source
This commit is contained in:
Cosimo Cecchi
2015-06-27 13:15:41 -07:00
parent 06b943fec9
commit 8832648846
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
gtk/gtksocket.c
View File

@ -34,6 +34,7 @@
#include "gtksizerequest.h" #include "gtksizerequest.h"
#include "gtkplug.h" #include "gtkplug.h"
#include "gtkprivate.h" #include "gtkprivate.h"
#include "gtkrender.h"
#include "gtkdnd.h" #include "gtkdnd.h"
#include "gtkdebug.h" #include "gtkdebug.h"
#include "gtkintl.h" #include "gtkintl.h"
@ -185,6 +186,18 @@ gtk_socket_finalize (GObject *object)
G_OBJECT_CLASS (gtk_socket_parent_class)->finalize (object); G_OBJECT_CLASS (gtk_socket_parent_class)->finalize (object);
} }
static gboolean
gtk_socket_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_socket_parent_class)->draw (widget, cr);
}
static void static void
gtk_socket_class_init (GtkSocketClass *class) gtk_socket_class_init (GtkSocketClass *class)
{ {
@ -209,6 +222,7 @@ gtk_socket_class_init (GtkSocketClass *class)
widget_class->key_press_event = gtk_socket_key_event; widget_class->key_press_event = gtk_socket_key_event;
widget_class->key_release_event = gtk_socket_key_event; widget_class->key_release_event = gtk_socket_key_event;
widget_class->focus = gtk_socket_focus; widget_class->focus = gtk_socket_focus;
widget_class->draw = gtk_socket_draw;
/* We don't want to show_all the in-process plug, if any. /* We don't want to show_all the in-process plug, if any.
*/ */
@ -398,9 +412,6 @@ gtk_socket_realize (GtkWidget *widget)
gtk_widget_set_window (widget, window); gtk_widget_set_window (widget, window);
gtk_widget_register_window (widget, window); gtk_widget_register_window (widget, window);
gtk_style_context_set_background (gtk_widget_get_style_context (widget),
window);
XGetWindowAttributes (GDK_WINDOW_XDISPLAY (window), XGetWindowAttributes (GDK_WINDOW_XDISPLAY (window),
GDK_WINDOW_XID (window), GDK_WINDOW_XID (window),
&xattrs); &xattrs);