summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-10-26 13:33:20 +0300
committerAndrei Karas <akaras@inbox.ru>2012-10-26 13:48:26 +0300
commit75a80fdfdce4be53ce7d7b1d02400d3f79a144c0 (patch)
treeac13334dd960a3dfb65aaebbba247e6245d1e104 /src/gui
parent9abb51fce0cca32ebe267c4797363d99520c2a0a (diff)
downloadplus-75a80fdfdce4be53ce7d7b1d02400d3f79a144c0.tar.gz
plus-75a80fdfdce4be53ce7d7b1d02400d3f79a144c0.tar.bz2
plus-75a80fdfdce4be53ce7d7b1d02400d3f79a144c0.tar.xz
plus-75a80fdfdce4be53ce7d7b1d02400d3f79a144c0.zip
Android compilation fixes.
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/setup_video.cpp15
1 files changed, 10 insertions, 5 deletions
diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp
index 9eaf5be56..688519743 100644
--- a/src/gui/setup_video.cpp
+++ b/src/gui/setup_video.cpp
@@ -253,15 +253,20 @@ Setup_Video::Setup_Video(const Widget2 *const widget) :
scrollArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
mOpenGLListModel = new OpenGLListModel;
- mOpenGLDropDown = new DropDown(widget, mOpenGLListModel),
- mOpenGLDropDown->setSelected(mOpenGLEnabled);
-
- mModeList->setEnabled(true);
+ mOpenGLDropDown = new DropDown(widget, mOpenGLListModel);
-#ifndef USE_OPENGL
+#ifdef USE_OPENGL
+#ifdef ANDROID
+ if (mOpenGLEnabled == 1 || mOpenGLEnabled == 2)
+ mOpenGLEnabled = 3;
+#endif
+ mOpenGLDropDown->setSelected(mOpenGLEnabled);
+#else
mOpenGLDropDown->setSelected(0);
#endif
+ mModeList->setEnabled(true);
+
mFpsLabel->setCaption(mFps > 0 ? toString(mFps) : _("None"));
mFpsLabel->setWidth(60);
mAltFpsLabel->setCaption(_("Alt FPS limit: ") + (mAltFps > 0