working on the termination of the last hardcoded dialogs in Autopilot/auto_gui.cxx:

[flightgear.git] / src / Autopilot / auto_gui.cxx

diff --git a/src/Autopilot/auto_gui.cxx b/src/Autopilot/auto_gui.cxx
index 21a435513b51080c371e2cf58d211cf904f0f208..01ebce80e2f4d3595b3789ecf7380532f006e6f7 100644 (file)
--- a/src/Autopilot/auto_gui.cxx
+++ b/src/Autopilot/auto_gui.cxx
@@ -17,7 +17,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 // $Id$
 
@@ -644,7 +644,6 @@ void TgtAptDialog_OK (puObject *)
 int NewWaypoint( const string& Tgt_Alt )
 {
   string TgtAptId;
-  FGAirport a;
   FGFix f;
 
   double alt = 0.0;
@@ -661,15 +660,15 @@ int NewWaypoint( const string& Tgt_Alt )
   }
 
   FGRouteMgr *rm = (FGRouteMgr *)globals->get_subsystem("route-manager");
-
-  if ( fgFindAirportID( TgtAptId, &a ) ) {
+  const FGAirport *a = fgFindAirportID( TgtAptId);
+  if (a) {
 
       SG_LOG( SG_GENERAL, SG_INFO,
               "Adding waypoint (airport) = " << TgtAptId );
 
       sprintf( NewTgtAirportId, "%s", TgtAptId.c_str() );
 
-      SGWayPoint wp( a.getLongitude(), a.getLatitude(), alt,
+      SGWayPoint wp( a->getLongitude(), a->getLatitude(), alt,
                      SGWayPoint::WGS84, TgtAptId );
       rm->add_waypoint( wp );
 
@@ -852,7 +851,7 @@ void NewTgtAirportInit()
         
         TgtAptDialogWPList = new puListBox ( 50, 130, 300, 320 ) ;
         TgtAptDialogWPList -> setLabel ( "Flight Plan" );
-        TgtAptDialogWPList -> setLabelPlace ( PUPLACE_TOP_LEFT ) ;
+        TgtAptDialogWPList -> setLabelPlace ( PUPLACE_ABOVE ) ;
         TgtAptDialogWPList -> setStyle ( -PUSTYLE_SMALL_SHADED ) ;
         TgtAptDialogWPList -> setValue ( 0 ) ;
 
@@ -872,7 +871,7 @@ void NewTgtAirportInit()
 
         TgtAptDialogInput   = new puInput           (50, 70, 300, 100);
         TgtAptDialogInput -> setLabel ( NewTgtAirportLabel );
-        TgtAptDialogInput -> setLabelPlace ( PUPLACE_TOP_LEFT ) ;
+        TgtAptDialogInput -> setLabelPlace ( PUPLACE_ABOVE ) ;
         TgtAptDialogInput   ->    setValue          (NewTgtAirportId);
         TgtAptDialogInput   ->    acceptInput();