diff options
author | Andrei Karas <akaras@inbox.ru> | 2014-03-16 19:28:44 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2014-03-16 19:28:44 +0300 |
commit | 3c02e309bbe285f9fb625f20f55533ff0b22b3cc (patch) | |
tree | c18db46312c4f430da82688903007682f4d69dcf /src/gui/widgets/basiccontainer.h | |
parent | 0ebe35be8527732a9c04a20103db6a34391efb24 (diff) | |
download | manaverse-3c02e309bbe285f9fb625f20f55533ff0b22b3cc.tar.gz manaverse-3c02e309bbe285f9fb625f20f55533ff0b22b3cc.tar.bz2 manaverse-3c02e309bbe285f9fb625f20f55533ff0b22b3cc.tar.xz manaverse-3c02e309bbe285f9fb625f20f55533ff0b22b3cc.zip |
Improve basiccontainer.
Diffstat (limited to 'src/gui/widgets/basiccontainer.h')
-rw-r--r-- | src/gui/widgets/basiccontainer.h | 30 |
1 files changed, 9 insertions, 21 deletions
diff --git a/src/gui/widgets/basiccontainer.h b/src/gui/widgets/basiccontainer.h index 6e753a445..7d7876b2f 100644 --- a/src/gui/widgets/basiccontainer.h +++ b/src/gui/widgets/basiccontainer.h @@ -110,28 +110,27 @@ class BasicContainer : public Widget, // Inherited from Widget - virtual void moveToTop(Widget* widget); + virtual void moveToTop(Widget* widget) override; - virtual void moveToBottom(Widget* widget); + virtual void moveToBottom(Widget* widget) override; - virtual Rect getChildrenArea() A_WARN_UNUSED; + virtual Rect getChildrenArea() override A_WARN_UNUSED; - virtual void focusNext(); + virtual void focusNext() override; - virtual void focusPrevious(); + virtual void focusPrevious() override; - virtual void logic(); + virtual void logic() override; - virtual void _setFocusHandler(FocusHandler* focusHandler); + virtual void _setFocusHandler(FocusHandler* focusHandler) override; void setInternalFocusHandler(FocusHandler* focusHandler); - virtual Widget *getWidgetAt(int x, int y) A_WARN_UNUSED; - + virtual Widget *getWidgetAt(int x, int y) override A_WARN_UNUSED; // Inherited from DeathListener - virtual void death(const Event& event); + virtual void death(const Event& event) override; protected: /** @@ -171,17 +170,6 @@ class BasicContainer : public Widget, virtual void logicChildren(); /** - * Finds a widget given an id. This function can be useful - * when implementing a GUI generator for Guichan, such as - * the ability to create a Guichan GUI from an XML file. - * - * @param id The id to find a widget by. - * @return The widget with the corrosponding id, - NULL of no widget is found. - */ - virtual Widget* findWidgetById(const std::string& id) A_WARN_UNUSED; - - /** * Typedef. */ typedef std::vector<Widget *> WidgetList; |