Removed a couple of the deprecated dialogs, and removed the old

predefined bindings for F11 and F12.  Instead, there is now a soft
binding from F11 to the autopilot dialog.

diff --git a/src/GUI/menubar.cxx b/src/GUI/menubar.cxx
index 38de42f5832daaa0560699ca1347b058ffaa8ed5..ca23a721e04d4c177bd208f9d14907b857d652dd 100644 (file)
--- a/src/GUI/menubar.cxx
+++ b/src/GUI/menubar.cxx
@@ -157,22 +157,6 @@ do_preset_commit_dialog (const SGPropertyNode * arg)
     return true;
 }
 
-extern void NewAltitude (puObject *);
-static bool
-do_ap_altitude_dialog (const SGPropertyNode * arg)
-{
-    NewAltitude(0);
-    return true;
-}
-
-extern void NewHeading (puObject *);
-static bool
-do_ap_heading_dialog (const SGPropertyNode * arg)
-{
-    NewHeading(0);
-    return true;
-}
-
 extern void AddWayPoint (puObject *);
 static bool
 do_ap_add_waypoint_dialog (const SGPropertyNode * arg)
@@ -245,8 +229,6 @@ static struct {
     { "old-preset-glideslope-dialog", do_preset_glideslope_dialog },
     { "old-preset-airspeed-dialog", do_preset_airspeed_dialog },
     { "old-preset-commit-dialog", do_preset_commit_dialog },
-    { "old-ap-altitude-dialog", do_ap_altitude_dialog },
-    { "old-ap-heading-dialog", do_ap_heading_dialog },
     { "old-ap-add-waypoint-dialog", do_ap_add_waypoint_dialog },
     { "old-ap-pop-waypoint-dialog", do_ap_pop_waypoint_dialog },
     { "old-ap-clear-route-dialog", do_ap_clear_route_dialog },

diff --git a/src/Input/input.cxx b/src/Input/input.cxx
index 38aec103b8dbff75973604992ccea3bfb2736bc3..03f90c2f972ecd6ebc00ba190530816b79b911f9 100644 (file)
--- a/src/Input/input.cxx
+++ b/src/Input/input.cxx
@@ -310,14 +310,6 @@ FGInput::doKey (int k, int modifiers, int x, int y)
                     FGAutopilot::FG_TC_HEADING_LOCK );
             }
             return;
-        case 256+GLUT_KEY_F11: // F11 Altitude Dialog.
-            SG_LOG(SG_INPUT, SG_INFO, "Invoking Altitude call back function");
-            NewAltitude( NULL );
-            return;
-        case 256+GLUT_KEY_F12: // F12 Heading Dialog...
-            SG_LOG(SG_INPUT, SG_INFO, "Invoking Heading call back function");
-            NewHeading( NULL );
-            return;
         }
 
 // END SPECIALS