From 69eed715f80c24c2435c82bb9fa1954697bf3af0 Mon Sep 17 00:00:00 2001 From: Stijn Buys Date: Sun, 4 Sep 2011 17:54:51 +0000 Subject: Moved main menu infrastructure into client namespace, removed ui::Container and ui::Menu classes. --- src/ui/ui.h | 27 --------------------------- 1 file changed, 27 deletions(-) (limited to 'src/ui/ui.h') diff --git a/src/ui/ui.h b/src/ui/ui.h index b3bb43b..cd2e38c 100644 --- a/src/ui/ui.h +++ b/src/ui/ui.h @@ -31,28 +31,11 @@ public: /// list visible widgets void list_visible() const; - /// list meus - void list_menus() const; - - /// make a window the active window - void show_menu(const char *label); - - /// hide the active window - void hide_menu(); - - /// show previous window - void previous_menu(); - /// the console inline Console *console() { return ui_console; } - /// return the active menu - Window *active() { - return ui_active_menu; - } - /// return the widget with global mouse focus inline Widget *mouse_focus() const { return ui_mouse_focus; @@ -108,13 +91,6 @@ public: static math::Vector2f elementsize; protected: - typedef std::list Menus; - - Menus::iterator find_menu(Window *menu); - Window *find_menu(const char *label); - - void add_menu(Window *window); - /* -- event handlers --------------------------------------- */ /// handle keypress events @@ -131,14 +107,11 @@ private: Font *ui_font_small; Font *ui_font_large; - Window *ui_active_menu; Widget *ui_mouse_focus; Widget *ui_input_focus; Console *ui_console; - Menus ui_menus; - /// TODO move to separate object to handle mouse cursor drawing math::Vector2f mouse_cursor; std::string mouse_pointer_bitmap; -- cgit v1.2.3