Norman's fix to make the help system start on Win32.

And fixed up some other non-sensical code in the vicinity which
was generating compiler warnings.

diff --git a/src/GUI/gui_funcs.cxx b/src/GUI/gui_funcs.cxx
index 9800785be87670fe29916bce91ba87f23a1a2ead..9f595d2bf7a36b9f55b0f033f61d5f6691bdee6a 100644 (file)
--- a/src/GUI/gui_funcs.cxx
+++ b/src/GUI/gui_funcs.cxx
@@ -53,6 +53,14 @@
 #include <stdlib.h>
 #include <string.h>
 
+// for help call back
+#ifdef WIN32
+# include <shellapi.h>
+# ifdef __CYGWIN__
+#  include <sys/cygwin.h>
+# endif
+#endif
+
 #include <simgear/constants.h>
 #include <simgear/debug/logstream.hxx>
 #include <simgear/misc/sg_path.hxx>
@@ -526,6 +534,7 @@ void helpCb (puObject *)
     path.append( "Docs/index.html" );
        
 #if !defined(WIN32)
+
     string help_app = fgGetString("/sim/startup/browser-app");
 
     if ( system("xwininfo -name Netscape > /dev/null 2>&1") == 0 ) {
@@ -534,12 +543,26 @@ void helpCb (puObject *)
         command = help_app + " " + path.str();
     }
     command += " &";
+    system( command.c_str() );
+
 #else // WIN32
-    command = "start ";
-    command += path.str();
+
+    // Look for favorite browser
+    char Dummy[1024], ExecName[1024], browserParameter[1024];
+    char win32_name[1024];
+# ifdef __CYGWIN__
+    cygwin32_conv_to_full_win32_path(path.c_str(),win32_name);
+# else
+    strcpy(win32_name,path.c_str());
+# endif
+    Dummy[0] = 0;
+    FindExecutable(win32_name, Dummy, ExecName);
+    sprintf(browserParameter, "file:///%s", win32_name);
+    ShellExecute ( NULL, "open", ExecName, browserParameter, Dummy,
+                   SW_SHOWNORMAL ) ;
+
 #endif
        
-    system( command.c_str() );
     mkDialog ("Help started in your web browser window.");
 }
 

diff --git a/src/GUI/sgVec3Slider.cxx b/src/GUI/sgVec3Slider.cxx
index e4a98bcaa968f7ab3e6eab3e6e8f2bb4d7953f88..454c7082e27749e3ff52d3885f64cf83c5b66871 100644 (file)
--- a/src/GUI/sgVec3Slider.cxx
+++ b/src/GUI/sgVec3Slider.cxx
@@ -16,6 +16,45 @@
 #include <Main/fg_props.hxx>
 #include <simgear/sg_inlines.h>
 
+static void
+setPilotXOffset (float value)
+{
+       PilotOffsetSet(0, value);
+}
+
+static float
+getPilotXOffset ()
+{
+       return( PilotOffsetGetSetting(0) );
+}
+
+
+static void
+setPilotYOffset (float value)
+{
+       PilotOffsetSet(1, value);
+}
+
+static float
+getPilotYOffset ()
+{
+       return( PilotOffsetGetSetting(1) );
+}
+
+
+static void
+setPilotZOffset (float value)
+{
+       PilotOffsetSet(2, value);
+}
+
+static float
+getPilotZOffset ()
+{
+       return( PilotOffsetGetSetting(2) );
+}
+
+
 class FloatSlider : public puSlider
 {
 
@@ -484,9 +523,9 @@ sgVec3 *PilotOffsetGet()
 // external function used to tie to FG properties
 float PilotOffsetGetSetting(int opt)
 {
-       float setting;
+       float setting = 0.0;
        if( PO_vec == 0 ) {
-               PilotOffsetInit();
+            PilotOffsetInit();
        }
        sgVec3Slider *me = (sgVec3Slider *)PO_vec -> getUserData();
         sgVec3 vec;

diff --git a/src/GUI/sgVec3Slider.hxx b/src/GUI/sgVec3Slider.hxx
index 8772dc6ccd312d537b57d118559e4680c82b3c77..58186d687498827a44568179c1ca95dbacceccb9 100644 (file)
--- a/src/GUI/sgVec3Slider.hxx
+++ b/src/GUI/sgVec3Slider.hxx
@@ -25,43 +25,3 @@ void PilotOffsetSet( int opt, float setting);
 float PilotOffsetGetSetting( int opt );
 
 #endif // _VEC3_SLIDER_H
-
-/* binding functions for chase view offset */
-
-static void
-setPilotXOffset (float value)
-{
-       PilotOffsetSet(0, value);
-}
-
-static float
-getPilotXOffset ()
-{
-       return( PilotOffsetGetSetting(0) );
-}
-
-
-static void
-setPilotYOffset (float value)
-{
-       PilotOffsetSet(1, value);
-}
-
-static float
-getPilotYOffset ()
-{
-       return( PilotOffsetGetSetting(1) );
-}
-
-
-static void
-setPilotZOffset (float value)
-{
-       PilotOffsetSet(2, value);
-}
-
-static float
-getPilotZOffset ()
-{
-       return( PilotOffsetGetSetting(2) );
-}