GTK: Port to gdk_x11_window_lookup_for_display

This API replaces gdk_window_lookup and gdk_xid_table_lookup which are
deprecated in 2.24. gdk_x11_window_lookup_for_display was added in 2.24.

As well porting the users to use this new API a compatability version was
added to the ui/base/gtk/gtk_compat.h file.

BUG=79722
TEST=Compiles and ui_unittests run. Chrome also runs.


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

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

1 files changed, 27 insertions, 0 deletions

diff --git a/ui/base/gtk/gdk_x_compat.h b/ui/base/gtk/gdk_x_compat.h
new file mode 100644
index 0000000..d304bb9
--- /dev/null
+++ b/ui/base/gtk/gdk_x_compat.h
@@ -0,0 +1,27 @@
+// 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.
+
+#ifndef UI_BASE_GTK_GDK_X_COMPAT_H_
+#define UI_BASE_GTK_GDK_X_COMPAT_H_
+#pragma once
+
+#include <gdk/gdkx.h>
+
+// Google Chrome must depend on GTK 2.18, at least until the next LTS drops
+// (and we might have to extend which version of GTK we want to target due to
+// RHEL). To make our porting job for GTK3 easier, we define all the methods
+// that replace deprecated APIs in this file and then include it everywhere.
+//
+// This file is organized first by version, and then with each version,
+// alphabetically by method.
+
+#if !GTK_CHECK_VERSION(2, 24, 0)
+inline GdkWindow* gdk_x11_window_lookup_for_display(GdkDisplay* display,
+                                                    Window window) {
+  return static_cast<GdkWindow*>(gdk_xid_table_lookup_for_display(display,
+                                                                  window));
+}
+#endif
+
+#endif  // UI_BASE_GTK_GDK_X_COMPAT_H_