fgelev: tool to query scenery elevation.

[flightgear.git] / utils / fgpanel / panel.cxx

diff --git a/utils/fgpanel/panel.cxx b/utils/fgpanel/panel.cxx
index ff8cdc6347958f5fff150cddc3d75f011fe3e811..45620d22a2a4f6d91b33493036ec46aa855fb043 100644 (file)
--- a/utils/fgpanel/panel.cxx
+++ b/utils/fgpanel/panel.cxx
@@ -31,12 +31,15 @@
 
 #include <simgear/compiler.h>
 
+#if defined (SG_MAC)
+#include <GLUT/glut.h>
+#else
 #include <GL/glut.h>
+#endif
 
 #include <plib/fnt.h>
 
 #include <simgear/debug/logstream.hxx>
-#include <simgear/math/SGMath.hxx>
 #include <simgear/misc/sg_path.hxx>
 
 #include "panel.hxx"
@@ -281,7 +284,7 @@ GLuint FGPanel::getInitDisplayList()
 void
 FGPanel::update (double dt)
 {
-  glCallList(getInitDisplayList());
+  /*glCallList*/(getInitDisplayList());
 
   // Draw the instruments.
   // Syd Adams: added instrument clipping
@@ -800,6 +803,11 @@ FGTextLayer::draw ()
     transform();
 
     text_renderer.setFont(ApplicationProperties::fontCache.getTexFont(_font_name.c_str()));
+    if (!text_renderer.getFont())
+    {
+        SG_LOG( SG_COCKPIT, SG_ALERT, "Missing font file: " << _font_name );
+        return;
+    }
 
     text_renderer.setPointSize(_pointSize);
     text_renderer.begin();