diff options
| author | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-22 03:12:31 +0000 |
|---|---|---|
| committer | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-22 03:12:31 +0000 |
| commit | a47aa89e77066507e80f97839e0c08e3432379ab (patch) | |
| tree | 9e58424dbb240bf676ba29a1da9da763e029a2c1 /ui/base/gtk | |
| parent | 7ffe7e1bbdebf463804537faca533326fe579499 (diff) | |
| download | chromium_src-a47aa89e77066507e80f97839e0c08e3432379ab.zip chromium_src-a47aa89e77066507e80f97839e0c08e3432379ab.tar.gz chromium_src-a47aa89e77066507e80f97839e0c08e3432379ab.tar.bz2 | |
GTK: Make the gtk port compile with GTK_DISABLE_SINGLE_INCLUDES.
BUG=79722
TEST=none
TBR=tony
Review URL: http://codereview.chromium.org/8586044
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111090 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/base/gtk')
| -rw-r--r-- | ui/base/gtk/gtk_floating_container.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/ui/base/gtk/gtk_floating_container.cc b/ui/base/gtk/gtk_floating_container.cc index edb080f..08449e2 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> @@ -41,6 +39,9 @@ GtkFloatingContainerChild* GetChild(GtkFloatingContainer* container, return NULL; } +const GParamFlags kStaticReadWriteProp = static_cast<GParamFlags>( + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); + } // namespace G_BEGIN_DECLS @@ -99,7 +100,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, @@ -110,7 +111,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", |