Revert 91761 - GTK: More 2.18 goodness. Move from macros to real accessor functions.

chrome/browser/ui/gtk/find_bar_gtk.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/find_bar_gtk.h"
 
 #include <gdk/gdkkeysyms.h>
 
 #include <algorithm>
 #include <string>
@@ skipping 419 matching lines @@
   gfx::Rect view_location(
       ltr ? dialog_bounds.width() - prefsize.width() : dialog_bounds.x(),
       dialog_bounds.y(), prefsize.width(), prefsize.height());
   gfx::Rect new_pos = FindBarController::GetLocationForFindbarView(
       view_location, dialog_bounds, avoid_overlapping_rect);
 
   return new_pos;
 }
 
 bool FindBarGtk::IsFindBarVisible() {
-  return gtk_widget_get_visible(widget());
+  return GTK_WIDGET_VISIBLE(widget());
 }
 
 void FindBarGtk::RestoreSavedFocus() {
   // This function sometimes gets called when we don't have focus. We should do
   // nothing in this case.
   if (!gtk_widget_is_focus(text_entry_))
     return;
 
   if (focus_store_.widget())
     gtk_widget_grab_focus(focus_store_.widget());
@@ skipping 228 matching lines @@
 
 void FindBarGtk::AdjustTextAlignment() {
   PangoDirection content_dir =
       pango_find_base_dir(gtk_entry_get_text(GTK_ENTRY(text_entry_)), -1);
 
   GtkTextDirection widget_dir = gtk_widget_get_direction(text_entry_);
 
   // Use keymap or widget direction if content does not have strong direction.
   // It matches the behavior of GtkEntry.
   if (content_dir == PANGO_DIRECTION_NEUTRAL) {
-    if (gtk_widget_has_focus(text_entry_)) {
+    if (GTK_WIDGET_HAS_FOCUS(text_entry_)) {
       content_dir = gdk_keymap_get_direction(
         gdk_keymap_get_for_display(gtk_widget_get_display(text_entry_)));
     } else {
       if (widget_dir == GTK_TEXT_DIR_RTL)
         content_dir = PANGO_DIRECTION_RTL;
       else
         content_dir = PANGO_DIRECTION_LTR;
     }
   }
 
@@ skipping 281 matching lines @@
 
 // static
 gboolean FindBarGtk::OnFocusOut(GtkWidget* entry, GdkEventFocus* event,
                                 FindBarGtk* find_bar) {
   g_signal_handlers_disconnect_by_func(
       gdk_keymap_get_for_display(gtk_widget_get_display(entry)),
       reinterpret_cast<gpointer>(&OnKeymapDirectionChanged), find_bar);
 
   return FALSE;  // Continue propagation.
 }