Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef UI_BASE_GTK_GTK_COMPAT_H_ | 5 #ifndef UI_BASE_GTK_GTK_COMPAT_H_ |
| 6 #define UI_BASE_GTK_GTK_COMPAT_H_ | 6 #define UI_BASE_GTK_GTK_COMPAT_H_ |
| 7 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #include <gtk/gtk.h> | 9 #include <gtk/gtk.h> |
| 10 | 10 |
| 11 // Google Chrome must depend on GTK 2.18, at least until the next LTS drops | 11 // Google Chrome must depend on GTK 2.18, at least until the next LTS drops |
| 12 // (and we might have to extend which version of GTK we want to target due to | 12 // (and we might have to extend which version of GTK we want to target due to |
| 13 // RHEL). To make our porting job for GTK3 easier, we define all the methods | 13 // RHEL). To make our porting job for GTK3 easier, we define all the methods |
| 14 // that replace deprecated APIs in this file and then include it everywhere. | 14 // that replace deprecated APIs in this file and then include it everywhere. |
| 15 // | 15 // |
| 16 // This file is organized first by version, and then with each version, | 16 // This file is organized first by version, and then with each version, |
| 17 // alphabetically by method. | 17 // alphabetically by method. |
| 18 | 18 |
| 19 #if !GTK_CHECK_VERSION(2, 20, 0) | 19 #if !GTK_CHECK_VERSION(2, 20, 0) |
| 20 inline gboolean gtk_widget_get_realized(GtkWidget* widget) { | 20 inline gboolean gtk_widget_get_realized(GtkWidget* widget) { |
| 21 return GTK_WIDGET_REALIZED(widget); | 21 return GTK_WIDGET_REALIZED(widget); |
| 22 } | 22 } |
| 23 | 23 |
| 24 inline gboolean gtk_widget_is_toplevel(GtkWidget* widget) { | 24 inline gboolean gtk_widget_is_toplevel(GtkWidget* widget) { |
| 25 return GTK_WIDGET_TOPLEVEL(widget); | 25 return GTK_WIDGET_TOPLEVEL(widget); |
| 26 } | 26 } |
| 27 #endif | 27 #endif |
| 28 | 28 |
| 29 #if !GTK_CHECK_VERSION(2, 18, 0) | |
| 30 inline gint gdk_visual_get_depth(GdkVisual* visual) { | |
|
Elliot Glaysher
2011/11/28 18:35:42
Please keep the GTK_CHECK_VERSION sections in orde
robert.bradford
2011/11/29 12:02:49
Done.
| |
| 31 return visual->depth; | |
| 32 } | |
| 33 #endif | |
| 34 | |
| 29 #if !GTK_CHECK_VERSION(2, 24, 0) | 35 #if !GTK_CHECK_VERSION(2, 24, 0) |
| 30 inline void gdk_pixmap_get_size(GdkPixmap* pixmap, gint* width, gint* height) { | 36 inline void gdk_pixmap_get_size(GdkPixmap* pixmap, gint* width, gint* height) { |
| 31 gdk_drawable_get_size(GDK_DRAWABLE(pixmap), width, height); | 37 gdk_drawable_get_size(GDK_DRAWABLE(pixmap), width, height); |
| 32 } | 38 } |
| 33 | 39 |
| 34 inline GdkScreen* gdk_window_get_screen(GdkWindow* window) { | 40 inline GdkScreen* gdk_window_get_screen(GdkWindow* window) { |
| 35 return gdk_drawable_get_screen(GDK_DRAWABLE(window)); | 41 return gdk_drawable_get_screen(GDK_DRAWABLE(window)); |
| 36 } | 42 } |
| 43 | |
| 44 inline int gdk_window_get_width(GdkWindow* window) | |
|
Elliot Glaysher
2011/11/28 18:35:42
Remove whitespace and match bracing style. add def
robert.bradford
2011/11/29 12:02:49
Done.
| |
| 45 { | |
| 46 int width; | |
| 47 | |
| 48 gdk_drawable_get_size(GDK_DRAWABLE(window), &width, NULL); | |
| 49 | |
| 50 return width; | |
| 51 } | |
| 52 | |
| 53 inline int gdk_window_get_height(GdkWindow* window) | |
| 54 { | |
| 55 int height; | |
| 56 | |
| 57 gdk_drawable_get_size(GDK_DRAWABLE(window), NULL, &height); | |
| 58 | |
| 59 return height; | |
| 60 } | |
| 61 | |
| 37 #endif | 62 #endif |
| 38 | 63 |
| 39 #endif // UI_BASE_GTK_GTK_COMPAT_H_ | 64 #endif // UI_BASE_GTK_GTK_COMPAT_H_ |
| OLD | NEW |