diff options
| author | Robin Gareus <robin@gareus.org> | 2016-09-29 13:56:10 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2016-09-29 13:56:10 +0200 |
| commit | d8291550e7d6ac09e2af49c383d0314de2514841 (patch) | |
| tree | 1111eb02166e7c298431b32df168409e0b6cdbb7 /libs/surfaces | |
| parent | 96b35db9bd551a73e44261d02d8b8a0da299ed9c (diff) | |
Rectangle is ambiguous on Windows
In file included from /usr/share/mingw-w64/include/windows.h:71:0,
from /home/ardour/win-stack-w32/include/pthread.h:198,
from /home/ardour/ardour-w32/libs/pbd/pbd/event_loop.h:29,
from /home/ardour/ardour-w32/libs/pbd/pbd/signals.h:42,
from /home/ardour/ardour-w32/libs/midi++2/midi++/parser.h:26,
from ../libs/surfaces/push2/mix.cc:30:
/usr/share/mingw-w64/include/wingdi.h:3049:67: note: candidates are: WINBOOL Rectangle(HDC, int, int, int, int)
In file included from ../libs/surfaces/push2/mix.cc:48:0:
/home/ardour/ardour-w32/libs/canvas/canvas/rectangle.h:30:48: note: class ArdourCanvas::Rectangle
Diffstat (limited to 'libs/surfaces')
| -rw-r--r-- | libs/surfaces/push2/menu.cc | 2 | ||||
| -rw-r--r-- | libs/surfaces/push2/mix.cc | 6 | ||||
| -rw-r--r-- | libs/surfaces/push2/scale.cc | 2 | ||||
| -rw-r--r-- | libs/surfaces/push2/track_mix.cc | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/libs/surfaces/push2/menu.cc b/libs/surfaces/push2/menu.cc index beefa6816f..116da8aded 100644 --- a/libs/surfaces/push2/menu.cc +++ b/libs/surfaces/push2/menu.cc @@ -67,7 +67,7 @@ Push2Menu::Push2Menu (Item* parent, vector<string> s) baseline = h; } - active_bg = new Rectangle (this); + active_bg = new ArdourCanvas::Rectangle (this); for (vector<string>::iterator si = s.begin(); si != s.end(); ++si) { Text* t = new Text (this); diff --git a/libs/surfaces/push2/mix.cc b/libs/surfaces/push2/mix.cc index 81428ef196..34b979ce46 100644 --- a/libs/surfaces/push2/mix.cc +++ b/libs/surfaces/push2/mix.cc @@ -77,7 +77,7 @@ MixLayout::MixLayout (Push2& p, Session & s, std::string const & name) { /* background */ - bg = new Rectangle (this); + bg = new ArdourCanvas::Rectangle (this); bg->set (Rect (0, 0, display_width(), display_height())); bg->set_fill_color (p2.get_color (Push2::DarkBackground)); @@ -93,12 +93,12 @@ MixLayout::MixLayout (Push2& p, Session & s, std::string const & name) /* background for text labels for knob function */ - Rectangle* r = new Rectangle (this); + ArdourCanvas::Rectangle* r = new ArdourCanvas::Rectangle (this); Coord x0 = 10 + (n*Push2Canvas::inter_button_spacing()) - 5; r->set (Rect (x0, 2, x0 + Push2Canvas::inter_button_spacing(), 2 + 21)); upper_backgrounds.push_back (r); - r = new Rectangle (this); + r = new ArdourCanvas::Rectangle (this); r->set (Rect (x0, 137, x0 + Push2Canvas::inter_button_spacing(), 137 + 21)); lower_backgrounds.push_back (r); diff --git a/libs/surfaces/push2/scale.cc b/libs/surfaces/push2/scale.cc index 72062129e9..8a1a16d0a4 100644 --- a/libs/surfaces/push2/scale.cc +++ b/libs/surfaces/push2/scale.cc @@ -52,7 +52,7 @@ ScaleLayout::ScaleLayout (Push2& p, Session & s, std::string const & name) /* background */ - bg = new Rectangle (this); + bg = new ArdourCanvas::Rectangle (this); bg->set (Rect (0, 0, display_width(), display_height())); bg->set_fill_color (p2.get_color (Push2::DarkBackground)); diff --git a/libs/surfaces/push2/track_mix.cc b/libs/surfaces/push2/track_mix.cc index f83b38aad7..aad94ec9da 100644 --- a/libs/surfaces/push2/track_mix.cc +++ b/libs/surfaces/push2/track_mix.cc @@ -81,7 +81,7 @@ TrackMixLayout::TrackMixLayout (Push2& p, Session & s, std::string const & name) { Pango::FontDescription fd ("Sans 10"); - bg = new Rectangle (this); + bg = new ArdourCanvas::Rectangle (this); bg->set (Rect (0, 0, display_width(), display_height())); bg->set_fill_color (p2.get_color (Push2::DarkBackground)); |