Added client::ButtonMenu base class, refactored client::EntityMenu as a ButtonMenu child.

1 files changed, 2 insertions, 11 deletions

diff --git a/src/client/entitymenu.h b/src/client/entitymenu.h
index 0285879..5bea94e 100644
--- a/src/client/entitymenu.h
+++ b/src/client/entitymenu.h
@@ -8,15 +8,13 @@
 #define __INCLUDED_CLIENT_ENTITYMENU_H__
 
 #include "core/entity.h"
-#include "ui/container.h"
-#include "ui/label.h"
-#include "ui/window.h"
+#include "client/buttonmenu.h"
 
 namespace client
 {
 
 /// entity menu
-class EntityMenu : public ui::Window
+class EntityMenu : public ButtonMenu
 {
 public:
 	/// create a new menu
@@ -40,18 +38,11 @@ public:
 	/// generate a menu from menu descriptions
 	void generate(core::Entity *entity, const char *menulabel);
 
-	/// clear the current menu
-	void clear();
-
 protected:
-	/// resize event
-	virtual void resize();
-
 	/// keypress event handler
 	virtual bool on_keypress(const int key, const unsigned int modifier);
 
 private:
-	ui::Container		*menu_container;
 	core::Entity 		*menu_generated_entity;
 	std::string		menu_generated_menu;
 };