diff options
author | nsylvain@google.com <nsylvain@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-05 19:19:25 +0000 |
---|---|---|
committer | nsylvain@google.com <nsylvain@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-05 19:19:25 +0000 |
commit | 13f29d976aa29c24a5f912f3d0e2484f397dca42 (patch) | |
tree | d078eaaa2ff642f2a029646a12a5127cf6cd9c47 /base/gfx/rect.h | |
parent | c213ae3cecdb13d713efe1dea8564cd03aec3588 (diff) | |
download | chromium_src-13f29d976aa29c24a5f912f3d0e2484f397dca42.zip chromium_src-13f29d976aa29c24a5f912f3d0e2484f397dca42.tar.gz chromium_src-13f29d976aa29c24a5f912f3d0e2484f397dca42.tar.bz2 |
Revert base\gfx changes because it breaks the build
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@386 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/gfx/rect.h')
-rw-r--r-- | base/gfx/rect.h | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/base/gfx/rect.h b/base/gfx/rect.h index d19bf7e..486f799 100644 --- a/base/gfx/rect.h +++ b/base/gfx/rect.h @@ -40,9 +40,7 @@ #include "base/gfx/size.h" #include "base/gfx/point.h" -#if defined(OS_WIN) typedef struct tagRECT RECT; -#endif namespace gfx { @@ -51,20 +49,12 @@ class Rect { Rect(); Rect(int width, int height); Rect(int x, int y, int width, int height); -#if defined(OS_WIN) explicit Rect(const RECT& r); -#elif defined(OS_MACOSX) - explicit Rect(const CGRect& r); -#endif Rect(const gfx::Point& origin, const gfx::Size& size); ~Rect() {} -#if defined(OS_WIN) Rect& operator=(const RECT& r); -#elif defined(OS_MACOSX) - Rect& operator=(const CGRect& r); -#endif int x() const { return origin_.x(); } void set_x(int x) { origin_.set_x(x); } @@ -103,13 +93,8 @@ class Rect { return !(*this == other); } -#if defined(OS_WIN) // Construct an equivalent Win32 RECT object. RECT ToRECT() const; -#elif defined(OS_MACOSX) - // Construct an equivalent CoreGraphics object. - CGRect ToCGRect() const; -#endif // Returns true if the point identified by point_x and point_y falls inside // this rectangle. The point (x, y) is inside the rectangle, but the |