diff options
| author | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-10 01:09:48 +0000 |
|---|---|---|
| committer | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-10 01:09:48 +0000 |
| commit | 9702f9511652af29060155d6809a2434eb4abb73 (patch) | |
| tree | 9ea195fc7acde6e04e13fdedb746a391eeb12b5c /ui/gfx/gtk_preserve_window.cc | |
| parent | 8fd219ac9e5bcce8aa55abbae4f024d6a9a4f505 (diff) | |
| download | chromium_src-9702f9511652af29060155d6809a2434eb4abb73.zip chromium_src-9702f9511652af29060155d6809a2434eb4abb73.tar.gz chromium_src-9702f9511652af29060155d6809a2434eb4abb73.tar.bz2 | |
Revert 116956 - GTK: Seal up GSEALs, focusing on GtkSelectionData.
BUG=79722
TEST=compiles
Review URL: http://codereview.chromium.org/9151007
TBR=erg@chromium.org
Review URL: http://codereview.chromium.org/9167002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116977 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/gfx/gtk_preserve_window.cc')
| -rw-r--r-- | ui/gfx/gtk_preserve_window.cc | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/ui/gfx/gtk_preserve_window.cc b/ui/gfx/gtk_preserve_window.cc index 1af85b1..5d40475 100644 --- a/ui/gfx/gtk_preserve_window.cc +++ b/ui/gfx/gtk_preserve_window.cc @@ -93,16 +93,18 @@ static void gtk_preserve_window_realize(GtkWidget* widget) { 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); } |