From b6635c7964a9757050aad1084076146fe9a3c6f8 Mon Sep 17 00:00:00 2001 From: scrawl Date: Sun, 7 Sep 2014 03:21:24 +0200 Subject: [PATCH] Move eventDone out of WindowBase --- apps/openmw/mwgui/birth.hpp | 5 +++++ apps/openmw/mwgui/class.hpp | 20 ++++++++++++++++++++ apps/openmw/mwgui/race.hpp | 5 +++++ apps/openmw/mwgui/review.hpp | 5 +++++ apps/openmw/mwgui/textinput.hpp | 5 +++++ apps/openmw/mwgui/windowbase.hpp | 5 ----- 6 files changed, 40 insertions(+), 5 deletions(-) diff --git a/apps/openmw/mwgui/birth.hpp b/apps/openmw/mwgui/birth.hpp index 20a64c78c..257dc6fef 100644 --- a/apps/openmw/mwgui/birth.hpp +++ b/apps/openmw/mwgui/birth.hpp @@ -35,6 +35,11 @@ namespace MWGui */ EventHandle_Void eventBack; + /** Event : Dialog finished, OK button clicked.\n + signature : void method()\n + */ + EventHandle_WindowBase eventDone; + protected: void onSelectBirth(MyGUI::ListBox* _sender, size_t _index); diff --git a/apps/openmw/mwgui/class.hpp b/apps/openmw/mwgui/class.hpp index 5c23c834d..846edc667 100644 --- a/apps/openmw/mwgui/class.hpp +++ b/apps/openmw/mwgui/class.hpp @@ -79,6 +79,11 @@ namespace MWGui */ EventHandle_Void eventBack; + /** Event : Dialog finished, OK button clicked.\n + signature : void method()\n + */ + EventHandle_WindowBase eventDone; + protected: void onOkClicked(MyGUI::Widget* _sender); void onBackClicked(MyGUI::Widget* _sender); @@ -109,6 +114,11 @@ namespace MWGui */ EventHandle_Void eventBack; + /** Event : Dialog finished, OK button clicked.\n + signature : void method()\n + */ + EventHandle_WindowBase eventDone; + protected: void onSelectClass(MyGUI::ListBox* _sender, size_t _index); void onAccept(MyGUI::ListBox* _sender, size_t _index); @@ -238,6 +248,11 @@ namespace MWGui std::string getTextInput() const { return mTextEdit->getCaption(); } void setTextInput(const std::string &text) { mTextEdit->setCaption(text); } + /** Event : Dialog finished, OK button clicked.\n + signature : void method()\n + */ + EventHandle_WindowBase eventDone; + protected: void onOkClicked(MyGUI::Widget* _sender); @@ -268,6 +283,11 @@ namespace MWGui */ EventHandle_Void eventBack; + /** Event : Dialog finished, OK button clicked.\n + signature : void method()\n + */ + EventHandle_WindowBase eventDone; + protected: void onOkClicked(MyGUI::Widget* _sender); void onBackClicked(MyGUI::Widget* _sender); diff --git a/apps/openmw/mwgui/race.hpp b/apps/openmw/mwgui/race.hpp index 46c4c5ef4..454c1d0b6 100644 --- a/apps/openmw/mwgui/race.hpp +++ b/apps/openmw/mwgui/race.hpp @@ -52,6 +52,11 @@ namespace MWGui */ EventHandle_Void eventBack; + /** Event : Dialog finished, OK button clicked.\n + signature : void method()\n + */ + EventHandle_WindowBase eventDone; + void doRenderUpdate(); protected: diff --git a/apps/openmw/mwgui/review.hpp b/apps/openmw/mwgui/review.hpp index 5d0767d21..01b106d90 100644 --- a/apps/openmw/mwgui/review.hpp +++ b/apps/openmw/mwgui/review.hpp @@ -54,6 +54,11 @@ namespace MWGui */ EventHandle_Void eventBack; + /** Event : Dialog finished, OK button clicked.\n + signature : void method()\n + */ + EventHandle_WindowBase eventDone; + EventHandle_Int eventActivateDialog; protected: diff --git a/apps/openmw/mwgui/textinput.hpp b/apps/openmw/mwgui/textinput.hpp index 1ed80fc1e..c83e3ffa9 100644 --- a/apps/openmw/mwgui/textinput.hpp +++ b/apps/openmw/mwgui/textinput.hpp @@ -22,6 +22,11 @@ namespace MWGui void setTextLabel(const std::string &label); virtual void open(); + /** Event : Dialog finished, OK button clicked.\n + signature : void method()\n + */ + EventHandle_WindowBase eventDone; + protected: void onOkClicked(MyGUI::Widget* _sender); void onTextAccepted(MyGUI::Edit* _sender); diff --git a/apps/openmw/mwgui/windowbase.hpp b/apps/openmw/mwgui/windowbase.hpp index 81073d419..53b10b452 100644 --- a/apps/openmw/mwgui/windowbase.hpp +++ b/apps/openmw/mwgui/windowbase.hpp @@ -32,11 +32,6 @@ namespace MWGui ///Returns the visibility state of the window virtual bool isVisible(); void center(); - - /** Event : Dialog finished, OK button clicked.\n - signature : void method()\n - */ - EventHandle_WindowBase eventDone; };