Set the white font in the ministatus window only in sdl mode until we have found a solution in openGL Mode. Disable the openGL Box when compiled without opengl support.

3 files changed, 10 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index ab17066d..fa24facb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,8 @@
 	* src/gui/status.cpp, src/gui/ministatus.cpp: Changed the font used
 	in mini-status. Dynamised previously statically placed widgets in
 	status win to avoid some label over-drawings.
+	* src/gui/setup.cpp: Enable the OpenGL Checkbox only if tmw has been
+	compiled with its support.
 
 2005-10-02  Bjørn Lindeijer  <bjorn@lindeijer.nl>
 
diff --git a/src/gui/ministatus.cpp b/src/gui/ministatus.cpp
index adfda434..eb2ebf53 100644
--- a/src/gui/ministatus.cpp
+++ b/src/gui/ministatus.cpp
@@ -27,6 +27,7 @@
 #include <sstream>
 
 #include "gui.h"
+#include <guichan/imagefont.hpp>
 #include "progressbar.h"
 
 #include "../playerinfo.h"
@@ -49,8 +50,10 @@ MiniStatusWindow::MiniStatusWindow():
 
     hpLabel = new gcn::Label("");
     mpLabel = new gcn::Label("");
-    hpLabel->setFont((gcn::Font*)speechFont);
-    mpLabel->setFont((gcn::Font*)speechFont);
+#ifndef USE_OPENGL
+    hpLabel->setFont(speechFont);
+    mpLabel->setFont(speechFont);
+#endif
 
     add(hpBar);
     add(mpBar);
diff --git a/src/gui/setup.cpp b/src/gui/setup.cpp
index 582670a5..1938231a 100644
--- a/src/gui/setup.cpp
+++ b/src/gui/setup.cpp
@@ -103,6 +103,9 @@ Setup::Setup():
     scrollArea = new ScrollArea(modeList);
     fsCheckBox = new CheckBox("Full screen", false);
     openGLCheckBox = new CheckBox("OpenGL", false);
+#ifndef USE_OPENGL
+    openGLCheckBox->setEnabled(false);
+#endif
     customCursorCheckBox = new CheckBox("Custom cursor");
     alphaLabel = new gcn::Label("Gui opacity");
     alphaSlider = new Slider(0.2, 1.0);