GTK: Remove deprecated methods and replace them with the new standard calls.

ui/gfx/gtk_preserve_window.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 "ui/gfx/gtk_preserve_window.h"
 
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
 
 #include "ui/base/gtk/gtk_compat.h"
@@ skipping 34 matching lines @@
 
   GObjectClass* gobject_class = G_OBJECT_CLASS(klass);
   g_type_class_add_private(gobject_class, sizeof(GtkPreserveWindowPrivate));
 }
 
 static void gtk_preserve_window_init(GtkPreserveWindow* widget) {
   GtkPreserveWindowPrivate* priv = GTK_PRESERVE_WINDOW_GET_PRIVATE(widget);
   priv->preserve_window = FALSE;
 
   // These widgets always have their own window.
-  gtk_fixed_set_has_window(GTK_FIXED(widget), TRUE);
+  gtk_widget_set_has_window(GTK_WIDGET(widget), TRUE);
 }
 
 GtkWidget* gtk_preserve_window_new() {
   return GTK_WIDGET(g_object_new(GTK_TYPE_PRESERVE_WINDOW, NULL));
 }
 
 static void gtk_preserve_window_destroy(GtkObject* object) {
   GtkWidget* widget = reinterpret_cast<GtkWidget*>(object);
   GtkPreserveWindowPrivate* priv = GTK_PRESERVE_WINDOW_GET_PRIVATE(widget);
 
@@ skipping 41 matching lines @@
 static void gtk_preserve_window_unrealize(GtkWidget* widget) {
   g_return_if_fail(GTK_IS_PRESERVE_WINDOW(widget));
 
   GtkPreserveWindowPrivate* priv = GTK_PRESERVE_WINDOW_GET_PRIVATE(widget);
   if (priv->preserve_window) {
     GtkWidgetClass* widget_class =
         GTK_WIDGET_CLASS(gtk_preserve_window_parent_class);
     GtkContainerClass* container_class =
         GTK_CONTAINER_CLASS(gtk_preserve_window_parent_class);
 
-    // Deprecated as of GTK 2.22. Used for compatibility.
-    // It should be: gtk_widget_get_mapped()
-    if (GTK_WIDGET_MAPPED(widget)) {
+    if (gtk_widget_get_mapped(widget)) {
       widget_class->unmap(widget);
 
-      // Deprecated as of GTK 2.22. Used for compatibility.
-      // It should be: gtk_widget_set_mapped(widget, FALSE)
-      GTK_WIDGET_UNSET_FLAGS(widget, GTK_MAPPED);
+      gtk_widget_set_mapped(widget, FALSE);
     }
 
     // This is the behavior from GtkWidget, inherited by GtkFixed.
     // It is unclear why we should not call the potentially overridden
     // unrealize method (via the callback), but doing so causes errors.
     container_class->forall(
         GTK_CONTAINER(widget), FALSE,
         reinterpret_cast<GtkCallback>(gtk_widget_unrealize), NULL);
 
     gtk_style_detach(widget->style);
     gdk_window_reparent(widget->window, gdk_get_default_root_window(), 0, 0);
     gtk_selection_remove_all(widget);
     gdk_window_set_user_data(widget->window, NULL);
 
-    // Deprecated as of GTK 2.22. Used for compatibility.
-    // It should be: gtk_widget_set_realized(widget, FALSE)
-    GTK_WIDGET_UNSET_FLAGS(widget, GTK_REALIZED);
+    gtk_widget_set_realized(widget, FALSE);
   } else {
     GTK_WIDGET_CLASS(gtk_preserve_window_parent_class)->unrealize(widget);
   }
 }
 
 gboolean gtk_preserve_window_get_preserve(GtkPreserveWindow* window) {
   g_return_val_if_fail(GTK_IS_PRESERVE_WINDOW(window), FALSE);
   GtkPreserveWindowPrivate* priv = GTK_PRESERVE_WINDOW_GET_PRIVATE(window);
 
   return priv->preserve_window;
@@ skipping 72 matching lines @@
   }
 }
 
 void gtk_preserve_window_delegate_resize(GtkPreserveWindow* widget,
                                          gboolean delegate) {
   GtkPreserveWindowPrivate* priv = GTK_PRESERVE_WINDOW_GET_PRIVATE(widget);
   priv->delegate_resize = delegate;
 }
 
 G_END_DECLS