Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(755)

Unified Diff: ui/gfx/gtk_preserve_window.cc

Issue 8588068: GTK: Create the start of a compatibility header wrapping deprecated methods. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Rebase to ToT and remove views/ cleanups. Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/gfx/gtk_native_view_id_manager.cc ('k') | webkit/plugins/npapi/gtk_plugin_container_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/gtk_preserve_window.cc
diff --git a/ui/gfx/gtk_preserve_window.cc b/ui/gfx/gtk_preserve_window.cc
index d67bc9230263b9701882b50af48c47201c280cf1..5a80302f263a9b99306a5fc479ba5e5ee2db34ad 100644
--- a/ui/gfx/gtk_preserve_window.cc
+++ b/ui/gfx/gtk_preserve_window.cc
@@ -9,6 +9,8 @@
#include <gtk/gtkwidget.h>
#include <gtk/gtkfixed.h>
+#include "ui/base/gtk/gtk_compat.h"
+
G_BEGIN_DECLS
#define GTK_PRESERVE_WINDOW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), \
@@ -180,7 +182,7 @@ void gtk_preserve_window_set_preserve(GtkPreserveWindow* window,
attributes_mask = GDK_WA_VISUAL | GDK_WA_COLORMAP | GDK_WA_NOREDIR;
widget->window = gdk_window_new(
gdk_get_default_root_window(), &attributes, attributes_mask);
- } else if (!value && widget->window && !GTK_WIDGET_REALIZED(widget)) {
+ } else if (!value && widget->window && !gtk_widget_get_realized(widget)) {
gdk_window_destroy(widget->window);
widget->window = NULL;
}
@@ -192,7 +194,7 @@ void gtk_preserve_window_size_allocate(GtkWidget* widget,
widget->allocation = *allocation;
- if (GTK_WIDGET_REALIZED(widget)) {
+ if (gtk_widget_get_realized(widget)) {
GtkPreserveWindowPrivate* priv = GTK_PRESERVE_WINDOW_GET_PRIVATE(widget);
if (priv->delegate_resize) {
gdk_window_move(widget->window, allocation->x, allocation->y);
« no previous file with comments | « ui/gfx/gtk_native_view_id_manager.cc ('k') | webkit/plugins/npapi/gtk_plugin_container_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698