From 8238bcddbda2d323a2949449e17cb57393bfd996 Mon Sep 17 00:00:00 2001
From: Tim Moore <timoore@redhat.com>
Date: Mon, 24 Aug 2009 18:00:10 +0200
Subject: [PATCH] fix warnings in GUI code

---
 src/GUI/gui_funcs.cxx   | 10 ++++------
 src/GUI/layout-test.cxx |  2 +-
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/GUI/gui_funcs.cxx b/src/GUI/gui_funcs.cxx
index bf418145b..1b7acf2b2 100644
--- a/src/GUI/gui_funcs.cxx
+++ b/src/GUI/gui_funcs.cxx
@@ -299,6 +299,8 @@ void fgHiResDump()
     /* just to be safe... */
     glPixelStorei(GL_PACK_ALIGNMENT, 1);
 
+    // OSGFIXME
+#if 0
     /* Because the HUD and Panel change the ViewPort we will
      * need to handle some lowlevel stuff ourselves */
     int ncols = trGet(tr, TR_COLUMNS);
@@ -311,7 +313,7 @@ void fgHiResDump()
     bool do_panel = fgPanelVisible();
     GLfloat panel_col_step = globals->get_current_panel()->getWidth() / ncols;
     GLfloat panel_row_step = globals->get_current_panel()->getHeight() / nrows;
-
+#endif
     glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);
     glHint(GL_POLYGON_SMOOTH_HINT, GL_NICEST);
     glHint(GL_LINE_SMOOTH_HINT, GL_NICEST);
@@ -323,7 +325,7 @@ void fgHiResDump()
     while (more) {
         trBeginTile(tr);
         int curColumn = trGet(tr, TR_CURRENT_COLUMN);
-        int curRow =  trGet(tr, TR_CURRENT_ROW);
+        // int curRow =  trGet(tr, TR_CURRENT_ROW);
 
         renderer->update( false );
         // OSGFIXME
@@ -536,8 +538,6 @@ void fgDumpSceneGraph()
     string message;
     static int count = 1;
 
-    FGRenderer *renderer = globals->get_renderer();
-
     static const SGPropertyNode *master_freeze
 	= fgGetNode("/sim/freeze/master");
 
@@ -581,8 +581,6 @@ void fgDumpTerrainBranch()
     string message;
     static int count = 1;
 
-    FGRenderer *renderer = globals->get_renderer();
-
     static const SGPropertyNode *master_freeze
 	= fgGetNode("/sim/freeze/master");
 
diff --git a/src/GUI/layout-test.cxx b/src/GUI/layout-test.cxx
index 0c7e3fed2..d4bf53a56 100644
--- a/src/GUI/layout-test.cxx
+++ b/src/GUI/layout-test.cxx
@@ -42,7 +42,7 @@ int main(int argc, char** argv)
     }
     fclose(tmp);
 
-    pwInit(0, 0, 600, 400, 0, "Layout Test", true, 0);
+    pwInit(0, 0, 600, 400, 0, const_cast<char*>("Layout Test"), true, 0);
     pwSetCallbacks(keyboardCB, mouseButtonCB, mouseMotionCB,
                    resizeCB, exitCB);