Merge branch 'master' into argbtesting/argbargb

Conflicts:
	src/FbTk/FbWindow.cc

1 files changed, 4 insertions, 2 deletions

diff --git a/src/FbTk/Menu.hh b/src/FbTk/Menu.hh
index 519a78b..09bdd8c 100644
--- a/src/FbTk/Menu.hh
+++ b/src/FbTk/Menu.hh
@@ -38,10 +38,10 @@
 
 namespace FbTk {
 
-class Command<class T>;
+template <typename T> class Command;
 class MenuItem;
 class ImageControl;
-class RefCount<class T>;
+template <typename T> class RefCount;
 
 ///   Base class for menus
 class Menu: public FbTk::EventHandler, FbTk::FbWindowRenderer,
@@ -83,6 +83,8 @@ public:
     virtual void lower();
     /// cycle through menuitems
     void cycleItems(bool reverse);
+    /// set and highlight new active index
+    void setActiveIndex(int new_index);
     void enterSubmenu();
 
     void disableTitle();