Changes in src/UIElements/TextUI/TextWindow.hpp [11428f:b59da6]

File:

• src/UIElements/TextUI/TextWindow.hpp (modified) (2 diffs)

src/UIElements/TextUI/TextWindow.hpp

@@ -11 +11 @@
 #include "MainWindow.hpp"
 
+#include <string>
 #include <set>
 
-class TextMenu;
+#include "Menu/TextMenu/TextMenu.hpp"
+
 class Action;
 class StringView;
 class TextStatusIndicator;
+class TxMenu;
 
 
@@ -28 +31 @@
 
 private:
-  // populaters
-  char getSuitableShortForm(std::set <char> &ShortcutList, const std::string name) const;
-  void populateMenu(TextMenu* Menu, const std::string &name);
-
-  TextMenu *main_menu;
+  TextMenu<TxMenu> *main_menu;
 
   // some actions only needed in textMenus
+  std::list<Action *> returnFromActions;
   Action *quitAction;
   // all views that are contained in the main Menu