summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/setup_colors.cpp2
-rw-r--r--src/gui/truetypefont.h4
2 files changed, 5 insertions, 1 deletions
diff --git a/src/gui/setup_colors.cpp b/src/gui/setup_colors.cpp
index 073bbc1a..caa53e2d 100644
--- a/src/gui/setup_colors.cpp
+++ b/src/gui/setup_colors.cpp
@@ -401,7 +401,7 @@ void Setup_Colors::updateColor()
Palette::ColorType type = guiPalette->getColorTypeAt(mSelected);
Palette::GradientType grad =
- static_cast<Palette::GradientType>(mGradTypeSlider->getValue());
+ static_cast<Palette::GradientType>((int)mGradTypeSlider->getValue());
guiPalette->setGradient(type, grad);
if (grad == Palette::STATIC)
diff --git a/src/gui/truetypefont.h b/src/gui/truetypefont.h
index cbe64368..25dcbe44 100644
--- a/src/gui/truetypefont.h
+++ b/src/gui/truetypefont.h
@@ -29,8 +29,12 @@
#ifdef __APPLE__
#include <SDL_ttf/SDL_ttf.h>
#else
+#ifdef __WIN32__
+#include <SDL/SDL_ttf.h>
+#else
#include <SDL_ttf.h>
#endif
+#endif
class TextChunk;