Merge branch 'tat/configure' into next

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

diff --git a/src/GUI/menubar.cxx b/src/GUI/menubar.cxx
index fd034c1969db1e0c15f3ce620c1e2a59b762d92a..513277dfc0f97f1dbd5b75feff4166996033b95e 100644 (file)
--- a/src/GUI/menubar.cxx
+++ b/src/GUI/menubar.cxx
@@ -6,8 +6,8 @@
 #include <iostream>
 #include <plib/pu.h>
 #include <simgear/debug/logstream.hxx>
+#include <simgear/structure/SGBinding.hxx>
 
-#include <Input/input.hxx>
 #include <Main/globals.hxx>
 
 #include "new_gui.hxx"
@@ -26,14 +26,6 @@
 // user-configured dialogs and new commands where necessary.
 ////////////////////////////////////////////////////////////////////////
 
-extern void reInit (void);
-static bool
-do_reinit_dialog (const SGPropertyNode * arg)
-{
-    reInit();
-    return true;
-}
-
 #if defined(TR_HIRES_SNAP)
 extern void dumpHiResSnapShot ();
 static bool
@@ -66,7 +58,6 @@ static struct {
     const char * name;
     SGCommandMgr::command_t command;
 } deprecated_dialogs [] = {
-    { "old-reinit-dialog", do_reinit_dialog },
 #if defined(TR_HIRES_SNAP)
     { "old-hires-snapshot-dialog", do_hires_snapshot_dialog },
 #endif