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

Unified Diff: ui/base/gtk/gtk_floating_container.cc

Issue 8586044: GTK: Make the gtk port compile with GTK_DISABLE_SINGLE_INCLUDES. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Remove views/. Not our problem for gtk3 porting. 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 | « printing/printing_context_gtk.cc ('k') | ui/gfx/gtk_preserve_window.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/gtk/gtk_floating_container.cc
diff --git a/ui/base/gtk/gtk_floating_container.cc b/ui/base/gtk/gtk_floating_container.cc
index 0bda427e41f0823557dc893e882a0933ab001230..8ba85440c7d15098602e2c867d6e6de980eaa776 100644
--- a/ui/base/gtk/gtk_floating_container.cc
+++ b/ui/base/gtk/gtk_floating_container.cc
@@ -5,8 +5,6 @@
#include "ui/base/gtk/gtk_floating_container.h"
#include <gtk/gtk.h>
-#include <gtk/gtkmarshal.h>
-#include <gtk/gtkprivate.h>
#include <algorithm>
@@ -39,6 +37,9 @@ GtkFloatingContainerChild* GetChild(GtkFloatingContainer* container,
return NULL;
}
+const GParamFlags kStaticReadWriteProp = static_cast<GParamFlags>(
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+
} // namespace
G_BEGIN_DECLS
@@ -97,7 +98,7 @@ static void gtk_floating_container_class_init(
G_MININT,
G_MAXINT,
0,
- static_cast<GParamFlags>(GTK_PARAM_READWRITE)));
+ kStaticReadWriteProp));
gtk_container_class_install_child_property(
container_class,
@@ -108,7 +109,7 @@ static void gtk_floating_container_class_init(
G_MININT,
G_MAXINT,
0,
- static_cast<GParamFlags>(GTK_PARAM_READWRITE)));
+ kStaticReadWriteProp));
floating_container_signals[SET_FLOATING_POSITION] =
g_signal_new("set-floating-position",
« no previous file with comments | « printing/printing_context_gtk.cc ('k') | ui/gfx/gtk_preserve_window.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698