GTK: Another GTK deprecation patch.

BUG=79722
TEST=none


Review URL: http://codereview.chromium.org/9109028

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116602 0039d316-1c4b-4281-b951-d872f2087c98

9 files changed, 32 insertions, 23 deletions

diff --git a/chrome/browser/ui/gtk/download/download_item_gtk.cc b/chrome/browser/ui/gtk/download/download_item_gtk.cc
index 3fe6e710..1664516 100644
--- a/chrome/browser/ui/gtk/download/download_item_gtk.cc
+++ b/chrome/browser/ui/gtk/download/download_item_gtk.cc
@@ -715,7 +715,7 @@ gboolean DownloadItemGtk::OnHboxExpose(GtkWidget* widget, GdkEventExpose* e) {
       // Draw a simple frame around the area when we're displaying the warning.
       gtk_paint_shadow(gtk_widget_get_style(widget),
                        gtk_widget_get_window(widget),
-                       static_cast<GtkStateType>(widget->state),
+                       gtk_widget_get_state(widget),
                        static_cast<GtkShadowType>(GTK_SHADOW_OUT),
                        &e->area, widget, "frame",
                        x, y, width, height);
@@ -727,7 +727,7 @@ gboolean DownloadItemGtk::OnHboxExpose(GtkWidget* widget, GdkEventExpose* e) {
       // the button, we instruct GTK to draw the entire button...with a
       // doctored clip rectangle to the left part of the button sans
       // separator. We then repeat this for the right button.
-      GtkStyle* style = body_.get()->style;
+      GtkStyle* style = gtk_widget_get_style(body_.get());
 
       GtkAllocation left_clip;
       gtk_widget_get_allocation(body_.get(), &left_clip);
diff --git a/chrome/browser/ui/gtk/find_bar_gtk.cc b/chrome/browser/ui/gtk/find_bar_gtk.cc
index 58119c1..114cb21 100644
--- a/chrome/browser/ui/gtk/find_bar_gtk.cc
+++ b/chrome/browser/ui/gtk/find_bar_gtk.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -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;
diff --git a/chrome/browser/ui/gtk/gtk_chrome_link_button.cc b/chrome/browser/ui/gtk/gtk_chrome_link_button.cc
index d487265..c9eb6fc 100644
--- a/chrome/browser/ui/gtk/gtk_chrome_link_button.cc
+++ b/chrome/browser/ui/gtk/gtk_chrome_link_button.cc
@@ -159,7 +159,7 @@ static void gtk_chrome_link_button_enter(GtkButton* button) {
 
 static void gtk_chrome_link_button_leave(GtkButton* button) {
   GtkWidget* widget = GTK_WIDGET(button);
-  gdk_window_set_cursor(widget->window, NULL);
+  gdk_window_set_cursor(gtk_widget_get_window(widget), NULL);
 }
 
 static void gtk_chrome_link_button_destroy(GtkObject* object) {
diff --git a/chrome/browser/ui/gtk/gtk_custom_menu_item.cc b/chrome/browser/ui/gtk/gtk_custom_menu_item.cc
index c830dbb..9fb1fb6 100644
--- a/chrome/browser/ui/gtk/gtk_custom_menu_item.cc
+++ b/chrome/browser/ui/gtk/gtk_custom_menu_item.cc
@@ -218,7 +218,8 @@ static void gtk_custom_menu_item_expose_button(GtkWidget* hbox,
   int width = last_allocation.width + last_allocation.x - first_allocation.x;
   int height = last_allocation.height;
 
-  gtk_paint_box(hbox->style, hbox->window,
+  gtk_paint_box(gtk_widget_get_style(hbox),
+                gtk_widget_get_window(hbox),
                 gtk_widget_get_state(current_button),
                 GTK_SHADOW_OUT,
                 &current_allocation, hbox, "button",
diff --git a/chrome/browser/ui/gtk/gtk_util.cc b/chrome/browser/ui/gtk/gtk_util.cc
index 54424a4..c963216 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;
   }
 
diff --git a/chrome/browser/ui/gtk/menu_gtk.cc b/chrome/browser/ui/gtk/menu_gtk.cc
index 510be61..85f44a7 100644
--- a/chrome/browser/ui/gtk/menu_gtk.cc
+++ b/chrome/browser/ui/gtk/menu_gtk.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -690,7 +690,7 @@ void MenuGtk::WidgetMenuPositionFunc(GtkMenu* menu,
 
   gtk_widget_size_request(GTK_WIDGET(menu), &menu_req);
 
-  gdk_window_get_origin(widget->window, x, y);
+  gdk_window_get_origin(gtk_widget_get_window(widget), x, y);
   GdkScreen *screen = gtk_widget_get_screen(widget);
   gint monitor = gdk_screen_get_monitor_at_point(screen, *x, *y);
 
diff --git a/chrome/browser/ui/gtk/reload_button_gtk.cc b/chrome/browser/ui/gtk/reload_button_gtk.cc
index 2b8df1e..8ca265a 100644
--- a/chrome/browser/ui/gtk/reload_button_gtk.cc
+++ b/chrome/browser/ui/gtk/reload_button_gtk.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -230,8 +230,9 @@ void ReloadButtonGtk::UpdateThemeButtons() {
 
   if (use_gtk) {
     gtk_widget_ensure_style(widget());
+    GtkStyle* style = gtk_widget_get_style(widget());
     GtkIconSet* icon_set = gtk_style_lookup_icon_set(
-        widget()->style,
+        style,
         (visible_mode_ == MODE_RELOAD) ? GTK_STOCK_REFRESH : GTK_STOCK_STOP);
     if (icon_set) {
       GtkStateType state = gtk_widget_get_state(widget());
@@ -240,7 +241,7 @@ void ReloadButtonGtk::UpdateThemeButtons() {
 
       GdkPixbuf* pixbuf = gtk_icon_set_render_icon(
           icon_set,
-          widget()->style,
+          style,
           gtk_widget_get_direction(widget()),
           state,
           GTK_ICON_SIZE_SMALL_TOOLBAR,
diff --git a/chrome/browser/ui/gtk/rounded_window.cc b/chrome/browser/ui/gtk/rounded_window.cc
index 4fb2220..aba7c96 100644
--- a/chrome/browser/ui/gtk/rounded_window.cc
+++ b/chrome/browser/ui/gtk/rounded_window.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -292,7 +292,7 @@ void StopActingAsRoundedWindow(GtkWidget* widget) {
   g_object_set_data(G_OBJECT(widget), kRoundedData, NULL);
 
   if (gtk_widget_get_realized(widget))
-    gdk_window_shape_combine_mask(widget->window, NULL, 0, 0);
+    gdk_window_shape_combine_mask(gtk_widget_get_window(widget), NULL, 0, 0);
 
   if (gtk_widget_get_visible(widget))
     gtk_widget_queue_draw(widget);
diff --git a/chrome/browser/ui/gtk/tab_contents_container_gtk.cc b/chrome/browser/ui/gtk/tab_contents_container_gtk.cc
index 48e45a9..f98be12 100644
--- a/chrome/browser/ui/gtk/tab_contents_container_gtk.cc
+++ b/chrome/browser/ui/gtk/tab_contents_container_gtk.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -165,9 +165,12 @@ void TabContentsContainerGtk::DetachTab(TabContentsWrapper* tab) {
 
   // It is possible to detach an unrealized, unparented TabContents if you
   // slow things down enough in valgrind. Might happen in the real world, too.
-  if (widget && widget->parent) {
-    DCHECK_EQ(widget->parent, expanded_);
-    gtk_container_remove(GTK_CONTAINER(expanded_), widget);
+  if (widget) {
+    GtkWidget* parent = gtk_widget_get_parent(widget);
+    if (parent) {
+      DCHECK_EQ(parent, expanded_);
+      gtk_container_remove(GTK_CONTAINER(expanded_), widget);
+    }
   }
 }