GTK: Create the start of a compatibility header wrapping deprecated methods.

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 <gdk/gdkx.h>
 #include <gtk/gtk.h>
 
@@ skipping 19 matching lines @@
 #include "content/browser/disposition_utils.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/public/common/renderer_preferences.h"
 #include "googleurl/src/gurl.h"
 #include "grit/theme_resources.h"
 #include "grit/theme_resources_standard.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/base/events.h"
+#include "ui/base/gtk/gtk_compat.h"
 #include "ui/base/gtk/gtk_hig_constants.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/text/text_elider.h"
 #include "ui/base/x/x11_util.h"
 #include "ui/gfx/gtk_util.h"
 #include "ui/gfx/image/image.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/frame/browser_view.h"
@@ skipping 44 matching lines @@
   gint button_mask = GPOINTER_TO_INT(userdata);
   if (button_mask && (1 << event->button))
     gtk_button_released(GTK_BUTTON(widget));
 
   return TRUE;
 }
 
 // Returns the approximate number of characters that can horizontally fit in
 // |pixel_width| pixels.
 int GetCharacterWidthForPixels(GtkWidget* widget, int pixel_width) {
-  DCHECK(GTK_WIDGET_REALIZED(widget))
+  DCHECK(gtk_widget_get_realized(widget))
       << " widget must be realized to compute font metrics correctly";
 
   PangoContext* context = gtk_widget_create_pango_context(widget);
   PangoFontMetrics* metrics = pango_context_get_metrics(context,
       widget->style->font_desc, pango_context_get_language(context));
 
   // This technique (max of char and digit widths) matches the code in
   // gtklabel.c.
   int char_width = pixel_width * PANGO_SCALE /
       std::max(pango_font_metrics_get_approximate_char_width(metrics),
@@ skipping 152 matching lines @@
   char* markup = g_markup_printf_escaped(kBoldLabelMarkup, text.c_str());
   gtk_label_set_markup(GTK_LABEL(label), markup);
   g_free(markup);
 
   return LeftAlignMisc(label);
 }
 
 void GetWidgetSizeFromCharacters(
     GtkWidget* widget, double width_chars, double height_lines,
     int* width, int* height) {
-  DCHECK(GTK_WIDGET_REALIZED(widget))
+  DCHECK(gtk_widget_get_realized(widget))
       << " widget must be realized to compute font metrics correctly";
   PangoContext* context = gtk_widget_create_pango_context(widget);
   PangoFontMetrics* metrics = pango_context_get_metrics(context,
       widget->style->font_desc, pango_context_get_language(context));
   if (width) {
     *width = static_cast<int>(
         pango_font_metrics_get_approximate_char_width(metrics) *
         width_chars / PANGO_SCALE);
   }
   if (height) {
     *height = static_cast<int>(
         (pango_font_metrics_get_ascent(metrics) +
         pango_font_metrics_get_descent(metrics)) *
         height_lines / PANGO_SCALE);
   }
   pango_font_metrics_unref(metrics);
   g_object_unref(context);
 }
 
 void GetWidgetSizeFromResources(
     GtkWidget* widget, int width_chars, int height_lines,
     int* width, int* height) {
-  DCHECK(GTK_WIDGET_REALIZED(widget))
+  DCHECK(gtk_widget_get_realized(widget))
       << " widget must be realized to compute font metrics correctly";
 
   double chars = 0;
   if (width)
     base::StringToDouble(l10n_util::GetStringUTF8(width_chars), &chars);
 
   double lines = 0;
   if (height)
     base::StringToDouble(l10n_util::GetStringUTF8(height_lines), &lines);
 
@@ skipping 523 matching lines @@
     GValue true_value = { 0 };
     g_value_init(&true_value, G_TYPE_BOOLEAN);
     g_value_set_boolean(&true_value, TRUE);
     g_object_set_property(G_OBJECT(image_menu_item), "always-show-image",
                           &true_value);
   }
 #endif
 }
 
 gfx::Rect GetWidgetRectRelativeToToplevel(GtkWidget* widget) {
-  DCHECK(GTK_WIDGET_REALIZED(widget));
+  DCHECK(gtk_widget_get_realized(widget));
 
   GtkWidget* toplevel = gtk_widget_get_toplevel(widget);
   DCHECK(toplevel);
-  DCHECK(GTK_WIDGET_REALIZED(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);
 }
 
 void SuppressDefaultPainting(GtkWidget* container) {
@@ skipping 279 matching lines @@
   gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
   gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
 
   // Do the simple thing in LTR because the bug only affects right-aligned
   // text. Also, when using the workaround, the label tries to maintain
   // uniform line-length, which we don't really want.
   if (gtk_widget_get_direction(label) == GTK_TEXT_DIR_LTR) {
     gtk_widget_set_size_request(label, pixel_width, -1);
   } else {
     // The label has to be realized before we can adjust its width.
-    if (GTK_WIDGET_REALIZED(label)) {
+    if (gtk_widget_get_realized(label)) {
       OnLabelRealize(label, GINT_TO_POINTER(pixel_width));
     } else {
       g_signal_connect(label, "realize", G_CALLBACK(OnLabelRealize),
                        GINT_TO_POINTER(pixel_width));
     }
   }
 }
 
 void InitLabelSizeRequestAndEllipsizeMode(GtkWidget* label) {
   GtkRequisition size;
@@ skipping 42 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