fly/flightgear
1
0
Fork 0
Code Activity

fix warnings in GUI code

Browse source
This commit is contained in:
Tim Moore 2009-08-24 18:00:10 +02:00
parent 185ede0159
commit 8238bcddbd
2 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/GUI/gui_funcs.cxx
View file

@ -299,6 +299,8 @@ void fgHiResDump()
/* just to be safe... */ /* just to be safe... */
glPixelStorei(GL_PACK_ALIGNMENT, 1); glPixelStorei(GL_PACK_ALIGNMENT, 1);
// OSGFIXME
#if 0
/* Because the HUD and Panel change the ViewPort we will /* Because the HUD and Panel change the ViewPort we will
* need to handle some lowlevel stuff ourselves */ * need to handle some lowlevel stuff ourselves */
int ncols = trGet(tr, TR_COLUMNS); int ncols = trGet(tr, TR_COLUMNS);
@ -311,7 +313,7 @@ void fgHiResDump()
bool do_panel = fgPanelVisible(); bool do_panel = fgPanelVisible();
GLfloat panel_col_step = globals->get_current_panel()->getWidth() / ncols; GLfloat panel_col_step = globals->get_current_panel()->getWidth() / ncols;
GLfloat panel_row_step = globals->get_current_panel()->getHeight() / nrows; GLfloat panel_row_step = globals->get_current_panel()->getHeight() / nrows;
#endif
glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST); glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);
glHint(GL_POLYGON_SMOOTH_HINT, GL_NICEST); glHint(GL_POLYGON_SMOOTH_HINT, GL_NICEST);
glHint(GL_LINE_SMOOTH_HINT, GL_NICEST); glHint(GL_LINE_SMOOTH_HINT, GL_NICEST);
@ -323,7 +325,7 @@ void fgHiResDump()
while (more) { while (more) {
trBeginTile(tr); trBeginTile(tr);
int curColumn = trGet(tr, TR_CURRENT_COLUMN); int curColumn = trGet(tr, TR_CURRENT_COLUMN);
int curRow = trGet(tr, TR_CURRENT_ROW); // int curRow = trGet(tr, TR_CURRENT_ROW);
renderer->update( false ); renderer->update( false );
// OSGFIXME // OSGFIXME
@ -536,8 +538,6 @@ void fgDumpSceneGraph()
string message; string message;
static int count = 1; static int count = 1;
FGRenderer *renderer = globals->get_renderer();
static const SGPropertyNode *master_freeze static const SGPropertyNode *master_freeze
= fgGetNode("/sim/freeze/master"); = fgGetNode("/sim/freeze/master");
@ -581,8 +581,6 @@ void fgDumpTerrainBranch()
string message; string message;
static int count = 1; static int count = 1;
FGRenderer *renderer = globals->get_renderer();
static const SGPropertyNode *master_freeze static const SGPropertyNode *master_freeze
= fgGetNode("/sim/freeze/master"); = fgGetNode("/sim/freeze/master");

2
src/GUI/layout-test.cxx
View file

@ -42,7 +42,7 @@ int main(int argc, char** argv)
} }
fclose(tmp); 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, pwSetCallbacks(keyboardCB, mouseButtonCB, mouseMotionCB,
resizeCB, exitCB); resizeCB, exitCB);