Bugfix - untie property.

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

diff --git a/src/GUI/gui_funcs.cxx b/src/GUI/gui_funcs.cxx
index 1b7acf2b27bfbf9ca89e9f0da3ff6032895d1953..ff6971549c1aee4ee53375dd35a3f5bff543618c 100644 (file)
--- a/src/GUI/gui_funcs.cxx
+++ b/src/GUI/gui_funcs.cxx
@@ -51,13 +51,10 @@
 #include <Main/viewmgr.hxx>
 #include <GUI/new_gui.hxx>
 
-#if defined( WIN32 ) && !defined( __CYGWIN__ ) && !defined(__MINGW32__)
-#  include <simgear/screen/win32-printer.h>
-#  include <simgear/screen/GlBitmaps.h>
-#endif
-#ifdef __MINGW32__
-#include <shellapi.h>
+#ifdef _WIN32
+#  include <shellapi.h>
 #endif
+
 #include "gui.h"
 
 using std::string;
@@ -75,9 +72,6 @@ const __fg_gui_fn_t __fg_gui_fn[] = {
         {"dumpHiResSnapShot", fgHiResDumpWrapper},
 #endif
         {"dumpSnapShot", fgDumpSnapShotWrapper},
-#if defined( WIN32 ) && !defined( __CYGWIN__) && !defined(__MINGW32__)
-        {"printScreen", printScreen},
-#endif
         // Help
         {"helpCb", helpCb},
 
@@ -170,7 +164,7 @@ void helpCb ()
     SGPath path( globals->get_fg_root() );
     path.append( "Docs/index.html" );
        
-#if !defined(WIN32)
+#ifndef _WIN32
 
     command = globals->get_browser();
     string::size_type pos;
@@ -182,7 +176,7 @@ void helpCb ()
     command += " &";
     system( command.c_str() );
 
-#else // WIN32
+#else // _WIN32
 
     // Look for favorite browser
     char Dummy[1024], ExecName[1024], browserParameter[1024];
@@ -403,61 +397,6 @@ void fgHiResDump()
 }
 #endif // #if defined( TR_HIRES_SNAP)
 
-
-#if defined( WIN32 ) && !defined( __CYGWIN__) && !defined(__MINGW32__)
-
-void rotateView( double roll, double pitch, double yaw )
-{
-       // rotate view
-}
-
-GlBitmap *b1 = NULL;
-GLubyte *hiResScreenCapture( int multiplier )
-{
-    float oldfov = fgGetDouble("/sim/current-view/field-of-view");
-    float fov = oldfov / multiplier;
-    FGViewer *v = globals->get_current_view();
-    fgSetDouble("/sim/current-view/field-of-view", fov);
-//     globals->get_renderer()->init();
-    int cur_width = fgGetInt("/sim/startup/xsize");
-    int cur_height = fgGetInt("/sim/startup/ysize");
-    delete( b1 );
-    // New empty (mostly) bitmap
-    b1 = new GlBitmap( GL_RGB, 1, 1, (unsigned char *)"123" );
-    int x,y;
-    for ( y = 0; y < multiplier; y++ ) {
-       for ( x = 0; x < multiplier; x++ ) {
-           globals->get_renderer()->resize( cur_width, cur_height );
-           // pan to tile
-           rotateView( 0, (y*fov)-((multiplier-1)*fov/2), (x*fov)-((multiplier-1)*fov/2) );
-           globals->get_renderer()->update( false );
-           // restore view
-           GlBitmap b2;
-           b1->copyBitmap( &b2, cur_width*x, cur_height*y );
-       }
-    }
-    fgSetDouble("/sim/current-view/field-of-view", oldfov);
-    return b1->getBitmap();
-}
-#endif
-
-#if defined( WIN32 ) && !defined( __CYGWIN__) && !defined(__MINGW32__)
-// win32 print screen function
-void printScreen () {
-    int mouse = fgGetMouseCursor();
-    fgSetMouseCursor(MOUSE_CURSOR_NONE);
-
-    CGlPrinter p( CGlPrinter::PRINT_BITMAP );
-    int cur_width = fgGetInt("/sim/startup/xsize");
-    int cur_height = fgGetInt("/sim/startup/ysize");
-    p.Begin( "FlightGear", cur_width*3, cur_height*3 );
-    p.End( hiResScreenCapture(3) );
-
-    fgSetMouseCursor(mouse);
-}
-#endif // #ifdef WIN32
-
-
 void fgDumpSnapShotWrapper () {
     fgDumpSnapShot();
 }
@@ -506,7 +445,7 @@ bool fgDumpSnapShot () {
     char filename[24];
     static int count = 1;
     while (count < 1000) {
-        snprintf(filename, 24, "fgfs-screen-%03d.ppm", count++);
+        snprintf(filename, 24, "fgfs-screen-%03d.png", count++);
 
         SGPath p(dir);
         p.append(filename);