summaryrefslogtreecommitdiff
path: root/src/wx
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2012-10-17 02:41:49 +0100
committerCarl Hetherington <cth@carlh.net>2012-10-17 02:41:49 +0100
commit5d2ba0d2f7855ffe18ff8e5a96156ca17e50cd2b (patch)
tree0341572be05213e0dbfb94720577616d9e3b002f /src/wx
parent7ef2ba523ca2ddc0470f5837bc88ad9c597361e2 (diff)
Windows apparently has Rectangle in the global namespace.
Diffstat (limited to 'src/wx')
-rw-r--r--src/wx/film_viewer.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index 6c8f38cfc..e2ab1db5d 100644
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -144,7 +144,7 @@ private:
GetSize (&vw, &vh);
/* Cropped rectangle */
- Rectangle cropped_area (
+ Rect cropped_area (
_film->crop().left,
_film->crop().top,
_image->GetWidth() - (_film->crop().left + _film->crop().right),
@@ -207,8 +207,8 @@ private:
base_area.height = base_image.GetHeight ();
}
- Rectangle base_area;
- Rectangle transformed_area;
+ Rect base_area;
+ Rect transformed_area;
wxImage base_image;
wxImage transformed_image;
shared_ptr<wxBitmap> bitmap;