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

Unified Diff: chrome/browser/ui/gtk/gtk_util.cc

Issue 9109028: GTK: Another GTK deprecation patch. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: evanm fix Created 8 years, 12 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 | « chrome/browser/ui/gtk/gtk_custom_menu_item.cc ('k') | chrome/browser/ui/gtk/menu_gtk.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/gtk/gtk_util.cc
diff --git a/chrome/browser/ui/gtk/gtk_util.cc b/chrome/browser/ui/gtk/gtk_util.cc
index 54424a4c3fc8b8206b03e5b886d4ffd689b45763..c963216a08ad971287610ef464e0f25c9d8c8940 100644
--- a/chrome/browser/ui/gtk/gtk_util.cc
+++ b/chrome/browser/ui/gtk/gtk_util.cc
@@ -845,7 +845,9 @@ bool GrabAllInput(GtkWidget* widget) {
if (!gtk_widget_get_visible(widget))
return false;
- if (!gdk_pointer_grab(widget->window, TRUE,
+ GdkWindow* gdk_window = gtk_widget_get_window(widget);
+ if (!gdk_pointer_grab(gdk_window,
+ TRUE,
GdkEventMask(GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK |
GDK_ENTER_NOTIFY_MASK |
@@ -855,8 +857,8 @@ bool GrabAllInput(GtkWidget* widget) {
return false;
}
- if (!gdk_keyboard_grab(widget->window, TRUE, time) == 0) {
- gdk_display_pointer_ungrab(gdk_drawable_get_display(widget->window), time);
+ if (!gdk_keyboard_grab(gdk_window, TRUE, time) == 0) {
+ gdk_display_pointer_ungrab(gdk_drawable_get_display(gdk_window), time);
return false;
}
« no previous file with comments | « chrome/browser/ui/gtk/gtk_custom_menu_item.cc ('k') | chrome/browser/ui/gtk/menu_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698