diff options
| author | jacob1 <jfu614@gmail.com> | 2012-09-04 00:09:53 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-09-06 23:52:56 (GMT) |
| commit | f8f70a3f770b6cbc1e9c182572317c0968af718b (patch) | |
| tree | 03e94654817ce2c944bcc75f484313331e2daf9d /src/interface/Slider.cpp | |
| parent | 58fa3dd539ad0ee7ebb44ec68515bdc22956c095 (diff) | |
| download | powder-f8f70a3f770b6cbc1e9c182572317c0968af718b.zip powder-f8f70a3f770b6cbc1e9c182572317c0968af718b.tar.gz | |
Visual studio compatibility
This removes some inlines when using visual studio to compile, uisng TPT_NO_INLINE. It also fixes many other problems visual studio has with the code
Diffstat (limited to 'src/interface/Slider.cpp')
| -rw-r--r-- | src/interface/Slider.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/interface/Slider.cpp b/src/interface/Slider.cpp index 474343e..652ae59 100644 --- a/src/interface/Slider.cpp +++ b/src/interface/Slider.cpp @@ -79,13 +79,13 @@ int Slider::GetValue() void Slider::SetColour(Colour col1, Colour col2) { + pixel pix[2] = {PIXRGB(col1.Red, col1.Green, col1.Blue), PIXRGB(col2.Red, col2.Green, col2.Blue)}; + float fl[2] = {0.0f, 1.0f}; if(bgGradient) free(bgGradient); this->col1 = col1; this->col2 = col2; - bgGradient = (unsigned char*)Graphics::GenerateGradient( - (pixel[2]){PIXRGB(col1.Red, col1.Green, col1.Blue), PIXRGB(col2.Red, col2.Green, col2.Blue)}, - (float[2]){0.0f, 1.0f}, 2, Size.X-7); + bgGradient = (unsigned char*)Graphics::GenerateGradient(pix, fl, 2, Size.X-7); } void Slider::SetValue(int value) |