diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-05-29 23:02:00 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-05-29 23:02:00 +0100 |
| commit | 07ee845fddca9c7f4e714cf0df8f3e755af7ed81 (patch) | |
| tree | 62328cf211c7d3c365e2619b00a9de12efef1f92 /src/lib/util.cc | |
| parent | 2c942f2794bae0500fa514281367eb4365ef59ba (diff) | |
Add magic lines to put the DVD-o-matic window at the front on OS X so that it gets a menu bar. Put our Rect in a namespace to hide from Carbon's version.
Diffstat (limited to 'src/lib/util.cc')
| -rw-r--r-- | src/lib/util.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/util.cc b/src/lib/util.cc index 2f8be6edd..b8b60c6f6 100644 --- a/src/lib/util.cc +++ b/src/lib/util.cc @@ -637,8 +637,8 @@ Socket::read_uint32 () /** @param other A Rect. * @return The intersection of this with `other'. */ -Rect -Rect::intersection (Rect const & other) const +dvdomatic::Rect +dvdomatic::Rect::intersection (Rect const & other) const { int const tx = max (x, other.x); int const ty = max (y, other.y); |