GTK: Remove more deprecated stuff.

chrome/browser/ui/gtk/gtk_util.cc

 // Copyright (c) 2011 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.
 
 #include "chrome/browser/ui/gtk/gtk_util.h"
 
 #include <cairo/cairo.h>
 
 #include <cstdarg>
 
@@ skipping 398 matching lines @@
                                            PANGO_SCALE * size_pixels);
   gtk_widget_modify_font(widget, font_desc);
   pango_font_description_free(font_desc);
 }
 
 void UndoForceFontSize(GtkWidget* widget) {
   gtk_widget_modify_font(widget, NULL);
 }
 
 gfx::Point GetWidgetScreenPosition(GtkWidget* widget) {
-  if (!widget->window) {
+  GdkWindow* window = gtk_widget_get_window(widget);
+
+  if (!window) {
     NOTREACHED() << "Must only be called on realized widgets.";
     return gfx::Point(0, 0);
   }
 
   gint x, y;
-  gdk_window_get_origin(widget->window, &x, &y);
+  gdk_window_get_origin(window, &x, &y);
 
-  if (GTK_WIDGET_NO_WINDOW(widget)) {
-    x += widget->allocation.x;
-    y += widget->allocation.y;
+  if (!gtk_widget_get_has_window(widget)) {
+    GtkAllocation allocation;
+    gtk_widget_get_allocation(widget, &allocation);
+    x += allocation.x;
+    y += allocation.y;
   }
 
   return gfx::Point(x, y);
 }
 
 gfx::Rect GetWidgetScreenBounds(GtkWidget* widget) {
   gfx::Point position = GetWidgetScreenPosition(widget);
+
+  GtkAllocation allocation;
+  gtk_widget_get_allocation(widget, &allocation);
+
   return gfx::Rect(position.x(), position.y(),
-                   widget->allocation.width, widget->allocation.height);
+                   allocation.width, allocation.height);
 }
 
 gfx::Size GetWidgetSize(GtkWidget* widget) {
   GtkRequisition size;
   gtk_widget_size_request(widget, &size);
   return gfx::Size(size.width, size.height);
 }
 
 void ConvertWidgetPointToScreen(GtkWidget* widget, gfx::Point* p) {
   DCHECK(widget);
@@ skipping 51 matching lines @@
                    G_CALLBACK(OnMouseButtonReleased), userdata);
 }
 
 void SetButtonTriggersNavigation(GtkWidget* button) {
   SetButtonClickableByMouseButtons(button, true, true, false);
 }
 
 int MirroredLeftPointForRect(GtkWidget* widget, const gfx::Rect& bounds) {
   if (!base::i18n::IsRTL())
     return bounds.x();
-  return widget->allocation.width - bounds.x() - bounds.width();
+
+  GtkAllocation allocation;
+  gtk_widget_get_allocation(widget, &allocation);
+  return allocation.width - bounds.x() - bounds.width();
 }
 
 int MirroredRightPointForRect(GtkWidget* widget, const gfx::Rect& bounds) {
   if (!base::i18n::IsRTL())
     return bounds.right();
-  return widget->allocation.width - bounds.x();
+
+  GtkAllocation allocation;
+  gtk_widget_get_allocation(widget, &allocation);
+  return allocation.width - bounds.x();
 }
 
 int MirroredXCoordinate(GtkWidget* widget, int x) {
-  if (base::i18n::IsRTL())
-    return widget->allocation.width - x;
+  if (base::i18n::IsRTL()) {
+    GtkAllocation allocation;
+    gtk_widget_get_allocation(widget, &allocation);
+    return allocation.width - x;
+  }
   return x;
 }
 
 bool WidgetContainsCursor(GtkWidget* widget) {
   gint x = 0;
   gint y = 0;
   gtk_widget_get_pointer(widget, &x, &y);
   return WidgetBounds(widget).Contains(x, y);
 }
 
@@ skipping 277 matching lines @@
 
   GtkWidget* toplevel = gtk_widget_get_toplevel(widget);
   DCHECK(toplevel);
   DCHECK(gtk_widget_get_realized(toplevel));
 
   gint x = 0, y = 0;
   gtk_widget_translate_coordinates(widget,
                                    toplevel,
                                    0, 0,
                                    &x, &y);
-  return gfx::Rect(x, y, widget->allocation.width, widget->allocation.height);
+
+  GtkAllocation allocation;
+  gtk_widget_get_allocation(widget, &allocation);
+  return gfx::Rect(x, y, allocation.width, allocation.height);
 }
 
 void SuppressDefaultPainting(GtkWidget* container) {
   g_signal_connect(container, "expose-event",
                    G_CALLBACK(PaintNoBackground), NULL);
 }
 
 WindowOpenDisposition DispositionForCurrentButtonPressEvent() {
   GdkEvent* event = gtk_get_current_event();
   if (!event) {
@@ skipping 29 matching lines @@
 
   gtk_grab_add(widget);
   return true;
 }
 
 gfx::Rect WidgetBounds(GtkWidget* widget) {
   // To quote the gtk docs:
   //
   //   Widget coordinates are a bit odd; for historical reasons, they are
   //   defined as widget->window coordinates for widgets that are not
-  //   GTK_NO_WINDOW widgets, and are relative to widget->allocation.x,
-  //   widget->allocation.y for widgets that are GTK_NO_WINDOW widgets.
+  //   GTK_NO_WINDOW widgets, and are relative to allocation.x, allocation.y
+  //   for widgets that are GTK_NO_WINDOW widgets.
   //
   // So the base is always (0,0).
-  return gfx::Rect(0, 0, widget->allocation.width, widget->allocation.height);
+  GtkAllocation allocation;
+  gtk_widget_get_allocation(widget, &allocation);
+  return gfx::Rect(0, 0, allocation.width, allocation.height);
 }
 
 void SetWMLastUserActionTime(GtkWindow* window) {
   gdk_x11_window_set_user_time(gtk_widget_get_window(GTK_WIDGET(window)),
                                XTimeNow());
 }
 
 guint32 XTimeNow() {
   struct timespec ts;
   clock_gettime(CLOCK_MONOTONIC, &ts);
@@ skipping 282 matching lines @@
 
 void DoCopy(BrowserWindow* window) {
   DoCutCopyPaste(window, &RenderViewHost::Copy, "copy-clipboard");
 }
 
 void DoPaste(BrowserWindow* window) {
   DoCutCopyPaste(window, &RenderViewHost::Paste, "paste-clipboard");
 }
 
 }  // namespace gtk_util