Merge branch 'next' into attenuation

[flightgear.git] / src / ATC / atcdialog.cxx

diff --git a/src/ATC/atcdialog.cxx b/src/ATC/atcdialog.cxx
index 41de936af77ea510081734e9ecf4b25972b615cf..5185ee0c049fa4c07f586599980c3bfa7a55604b 100644 (file)
--- a/src/ATC/atcdialog.cxx
+++ b/src/ATC/atcdialog.cxx
@@ -18,8 +18,13 @@
 //
 // $Id$
 
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
 #include <Main/fg_commands.hxx>
 #include <Main/globals.hxx>
+#include <Main/fg_props.hxx>
 
 #include <simgear/constants.h>
 #include <simgear/structure/commands.hxx>
@@ -35,11 +40,12 @@
 
 FGATCDialogNew *currentATCDialog;
 
-static bool doATCDialog(const SGPropertyNode* arg) {
-        cerr << "Running doATCDialog" << endl;
+/*static bool doATCDialog(const SGPropertyNode* arg) {
+        //cerr << "Running doATCDialog" << endl;
        currentATCDialog->PopupDialog();
        return(true);
-}
+}*/
+FGATCDialogNew * FGATCDialogNew::_instance = NULL;
 
 FGATCDialogNew::FGATCDialogNew()
 {
@@ -54,7 +60,7 @@ FGATCDialogNew::~FGATCDialogNew()
 
 void FGATCDialogNew::init() {
        // Add ATC-dialog to the command list
-       globals->get_commands()->addCommand("ATC-dialog", doATCDialog);
+    globals->get_commands()->addCommand("ATC-dialog", FGATCDialogNew::popup );
        // Add ATC-freq-search to the command list
        //globals->get_commands()->addCommand("ATC-freq-search", do_ATC_freq_search);