diff options
author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-10 15:09:39 +0000 |
---|---|---|
committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-10 15:09:39 +0000 |
commit | 9146221ca83c4996713894316661b442b20c9e28 (patch) | |
tree | 0cd1efb863d39a4ac44aacde045c957552e3da7d /base/gfx/rect.cc | |
parent | 98f5f88b53f774cee109503b0225a5bfb9deb550 (diff) | |
download | chromium_src-9146221ca83c4996713894316661b442b20c9e28.zip chromium_src-9146221ca83c4996713894316661b442b20c9e28.tar.gz chromium_src-9146221ca83c4996713894316661b442b20c9e28.tar.bz2 |
Adds some ifdefs so that test_shell can be compiled on linux
without GTK.
I had to recreate this patch as my workspace for various
resonds. UGH!
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/67024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13503 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/gfx/rect.cc')
-rwxr-xr-x | base/gfx/rect.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/base/gfx/rect.cc b/base/gfx/rect.cc index 3e7d782..003766b 100755 --- a/base/gfx/rect.cc +++ b/base/gfx/rect.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2009 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. @@ -8,7 +8,7 @@ #include <windows.h> #elif defined(OS_MACOSX) #include <CoreGraphics/CGGeometry.h> -#elif defined(OS_LINUX) +#elif defined(TOOLKIT_GTK) #include <gdk/gdk.h> #endif @@ -74,7 +74,7 @@ Rect& Rect::operator=(const CGRect& r) { set_height(r.size.height); return *this; } -#elif defined(OS_LINUX) +#elif defined(TOOLKIT_GTK) Rect::Rect(const GdkRectangle& r) : origin_(r.x, r.y) { set_width(r.width); @@ -140,7 +140,7 @@ RECT Rect::ToRECT() const { r.bottom = bottom(); return r; } -#elif defined(OS_LINUX) +#elif defined(TOOLKIT_GTK) GdkRectangle Rect::ToGdkRectangle() const { GdkRectangle r = {x(), y(), width(), height()}; return r; |