Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(35)

Unified Diff: ui/gfx/gtk_preserve_window.cc

Issue 9167002: Revert 116956 - GTK: Seal up GSEALs, focusing on GtkSelectionData. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/gfx/gtk_native_view_id_manager.cc ('k') | ui/gfx/screen_gtk.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/gtk_preserve_window.cc
===================================================================
--- ui/gfx/gtk_preserve_window.cc (revision 116976)
+++ ui/gfx/gtk_preserve_window.cc (working copy)
@@ -93,16 +93,18 @@
allocation.width,
allocation.height);
}
+ widget->style = gtk_style_attach(widget->style, widget->window);
+ gtk_style_set_background(gtk_widget_get_style(widget),
+ gdk_window, GTK_STATE_NORMAL);
+
gint event_mask = gtk_widget_get_events(widget);
event_mask |= GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK;
gdk_window_set_events(gdk_window, (GdkEventMask) event_mask);
gdk_window_set_user_data(gdk_window, widget);
- gtk_widget_set_realized(widget, TRUE);
-
- gtk_widget_style_attach(widget);
- gtk_style_set_background(gtk_widget_get_style(widget),
- gdk_window, GTK_STATE_NORMAL);
+ // Deprecated as of GTK 2.22. Used for compatibility.
+ // It should be: gtk_widget_set_realized(widget, TRUE)
+ GTK_WIDGET_SET_FLAGS(widget, GTK_REALIZED);
} else {
GTK_WIDGET_CLASS(gtk_preserve_window_parent_class)->realize(widget);
}
Property changes on: ui/gfx/gtk_preserve_window.cc
___________________________________________________________________
Deleted: svn:mergeinfo
« no previous file with comments | « ui/gfx/gtk_native_view_id_manager.cc ('k') | ui/gfx/screen_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698