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

Unified Diff: chrome/browser/ui/gtk/find_bar_gtk.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
Index: chrome/browser/ui/gtk/find_bar_gtk.cc
diff --git a/chrome/browser/ui/gtk/find_bar_gtk.cc b/chrome/browser/ui/gtk/find_bar_gtk.cc
index 58119c1256eefe5824009ab084d7654579a54c25..55b2f2c012110856708a99594705dd4efe400a6f 100644
--- a/chrome/browser/ui/gtk/find_bar_gtk.cc
+++ b/chrome/browser/ui/gtk/find_bar_gtk.cc
@@ -737,7 +737,7 @@ void FindBarGtk::OnParentSet(GtkWidget* widget, GtkObject* old_parent,
if (!widget->parent)
return;
- g_signal_connect(widget->parent, "set-floating-position",
+ g_signal_connect(gtk_widget_get_parent(widget), "set-floating-position",
G_CALLBACK(OnSetFloatingPosition), find_bar);
}
@@ -853,8 +853,9 @@ gboolean FindBarGtk::OnExpose(GtkWidget* widget, GdkEventExpose* e,
mask_points.size(),
GDK_EVEN_ODD_RULE);
// Reset the shape.
- gdk_window_shape_combine_region(widget->window, NULL, 0, 0);
- gdk_window_shape_combine_region(widget->window, mask_region, 0, 0);
+ GdkWindow* gdk_window = gtk_widget_get_window(widget);
+ gdk_window_shape_combine_region(gdk_window, NULL, 0, 0);
+ gdk_window_shape_combine_region(gdk_window, mask_region, 0, 0);
gdk_region_destroy(mask_region);
bar->container_width_ = allocation.width;
@@ -877,7 +878,8 @@ gboolean FindBarGtk::OnExpose(GtkWidget* widget, GdkEventExpose* e,
if (bar->container_width_ != allocation.width ||
bar->container_height_ != allocation.height) {
// Reset the shape.
- gdk_window_shape_combine_region(widget->window, NULL, 0, 0);
+ gdk_window_shape_combine_region(gtk_widget_get_window(widget),
+ NULL, 0, 0);
SetDialogShape(bar->container_);
bar->container_width_ = allocation.width;
« no previous file with comments | « chrome/browser/ui/gtk/download/download_item_gtk.cc ('k') | chrome/browser/ui/gtk/gtk_chrome_link_button.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698