diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-29 00:32:52 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-29 00:32:52 +0000 |
| commit | e43eddf1a5887c4b249af3daa024c1107ce254a1 (patch) | |
| tree | 994df09c627978ef3fb93a9fadebd00bebbcb31d /base/gfx | |
| parent | a672cb9dce10306f3b149802653dbb554b326a44 (diff) | |
| download | chromium_src-e43eddf1a5887c4b249af3daa024c1107ce254a1.zip chromium_src-e43eddf1a5887c4b249af3daa024c1107ce254a1.tar.gz chromium_src-e43eddf1a5887c4b249af3daa024c1107ce254a1.tar.bz2 | |
Changes to base/ from a combination of FreeBSD and OpenBSD patches.
Review URL: http://codereview.chromium.org/495002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35321 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/gfx')
| -rw-r--r-- | base/gfx/rect.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/base/gfx/rect.cc b/base/gfx/rect.cc index 2a35575..961fa03 100644 --- a/base/gfx/rect.cc +++ b/base/gfx/rect.cc @@ -8,7 +8,7 @@ #include <windows.h> #elif defined(OS_MACOSX) #include <CoreGraphics/CGGeometry.h> -#elif defined(OS_LINUX) +#elif defined(OS_POSIX) #include <gdk/gdk.h> #endif @@ -76,7 +76,7 @@ Rect& Rect::operator=(const CGRect& r) { set_height(r.size.height); return *this; } -#elif defined(OS_LINUX) +#elif defined(OS_POSIX) Rect::Rect(const GdkRectangle& r) : origin_(r.x, r.y) { set_width(r.width); @@ -128,15 +128,15 @@ RECT Rect::ToRECT() const { r.bottom = bottom(); return r; } -#elif defined(OS_LINUX) -GdkRectangle Rect::ToGdkRectangle() const { - GdkRectangle r = {x(), y(), width(), height()}; - return r; -} #elif defined(OS_MACOSX) CGRect Rect::ToCGRect() const { return CGRectMake(x(), y(), width(), height()); } +#elif defined(OS_POSIX) +GdkRectangle Rect::ToGdkRectangle() const { + GdkRectangle r = {x(), y(), width(), height()}; + return r; +} #endif bool Rect::Contains(int point_x, int point_y) const { |