Melchior: Make line wrapping in textboxes configurable, and enable it by default

[flightgear.git] / src / GUI / gui_funcs.cxx

diff --git a/src/GUI/gui_funcs.cxx b/src/GUI/gui_funcs.cxx
index 282929f3a6efd49fcf63545ee14f22ae7ccbf285..559d2ffb575b6d6f559ffd99140db785e1f0b9c4 100644 (file)
--- a/src/GUI/gui_funcs.cxx
+++ b/src/GUI/gui_funcs.cxx
@@ -79,6 +79,7 @@
 #include <Main/fg_io.hxx>
 #include <Main/globals.hxx>
 #include <Main/fg_props.hxx>
+#include <Main/renderer.hxx>
 #include <Main/viewmgr.hxx>
 
 #if defined( WIN32 ) && !defined( __CYGWIN__ ) && !defined(__MINGW32__)
@@ -385,9 +386,6 @@ void goodBye(puObject *)
     //      "Program exiting normally at user request." );
     cout << "Program exiting normally at user request." << endl;
 
-    // close all external I/O connections
-    globals->get_io()->shutdown_all();
-
     exit(0);
 }
 
@@ -710,7 +708,7 @@ GLubyte *hiResScreenCapture( int multiplier )
     globals->get_renderer()->init();
     int cur_width = fgGetInt("/sim/startup/xsize");
     int cur_height = fgGetInt("/sim/startup/ysize");
-    if (b1) delete( b1 );
+    delete( b1 );
     // New empty (mostly) bitmap
     b1 = new GlBitmap( GL_RGB, 1, 1, (unsigned char *)"123" );
     int x,y;