diff --git a/apps/openmw/mwgui/birth.hpp b/apps/openmw/mwgui/birth.hpp index 5afc5e16e0..db9e997b6c 100644 --- a/apps/openmw/mwgui/birth.hpp +++ b/apps/openmw/mwgui/birth.hpp @@ -26,7 +26,7 @@ namespace MWGui bool exit() override { return false; } // Events - typedef MyGUI::delegates::CMultiDelegate0 EventHandle_Void; + typedef MyGUI::delegates::MultiDelegate<> EventHandle_Void; /** Event : Back button clicked.\n signature : void method()\n diff --git a/apps/openmw/mwgui/bookpage.cpp b/apps/openmw/mwgui/bookpage.cpp index cd419f8cc9..11be4b0740 100644 --- a/apps/openmw/mwgui/bookpage.cpp +++ b/apps/openmw/mwgui/bookpage.cpp @@ -768,7 +768,11 @@ namespace MWGui void reset(float left, float top, MyGUI::Colour colour) { +#if MYGUI_VERSION <= MYGUI_DEFINE_VERSION(3, 4, 1) mC = MyGUI::texture_utility::toColourARGB(colour) | 0xFF000000; +#else + mC = MyGUI::texture_utility::toNativeColour(colour, MyGUI::VertexColourType::ColourARGB) | 0xFF000000; +#endif MyGUI::texture_utility::convertColour(mC, mVertexColourType); mCursor.left = mOrigin.left + left; diff --git a/apps/openmw/mwgui/class.hpp b/apps/openmw/mwgui/class.hpp index b231a64b1d..7cd7b01370 100644 --- a/apps/openmw/mwgui/class.hpp +++ b/apps/openmw/mwgui/class.hpp @@ -33,7 +33,7 @@ namespace MWGui bool exit() override { return false; } // Events - typedef MyGUI::delegates::CMultiDelegate1 EventHandle_Int; + typedef MyGUI::delegates::MultiDelegate EventHandle_Int; /** Event : Button was clicked.\n signature : void method(int index)\n @@ -77,7 +77,7 @@ namespace MWGui bool exit() override { return false; } // Events - typedef MyGUI::delegates::CMultiDelegate0 EventHandle_Void; + typedef MyGUI::delegates::MultiDelegate<> EventHandle_Void; /** Event : Back button clicked.\n signature : void method()\n @@ -114,7 +114,7 @@ namespace MWGui bool exit() override { return false; } // Events - typedef MyGUI::delegates::CMultiDelegate0 EventHandle_Void; + typedef MyGUI::delegates::MultiDelegate<> EventHandle_Void; /** Event : Back button clicked.\n signature : void method()\n @@ -158,7 +158,7 @@ namespace MWGui ESM::Class::Specialization getSpecializationId() const { return mSpecializationId; } // Events - typedef MyGUI::delegates::CMultiDelegate0 EventHandle_Void; + typedef MyGUI::delegates::MultiDelegate<> EventHandle_Void; /** Event : Cancel button clicked.\n signature : void method()\n @@ -191,7 +191,7 @@ namespace MWGui ESM::Attribute::AttributeID getAttributeId() const { return mAttributeId; } // Events - typedef MyGUI::delegates::CMultiDelegate0 EventHandle_Void; + typedef MyGUI::delegates::MultiDelegate<> EventHandle_Void; /** Event : Cancel button clicked.\n signature : void method()\n @@ -222,7 +222,7 @@ namespace MWGui ESM::RefId getSkillId() const { return mSkillId; } // Events - typedef MyGUI::delegates::CMultiDelegate0 EventHandle_Void; + typedef MyGUI::delegates::MultiDelegate<> EventHandle_Void; /** Event : Cancel button clicked.\n signature : void method()\n @@ -281,7 +281,7 @@ namespace MWGui void setNextButtonShow(bool shown); // Events - typedef MyGUI::delegates::CMultiDelegate0 EventHandle_Void; + typedef MyGUI::delegates::MultiDelegate<> EventHandle_Void; /** Event : Back button clicked.\n signature : void method()\n diff --git a/apps/openmw/mwgui/confirmationdialog.hpp b/apps/openmw/mwgui/confirmationdialog.hpp index 649e8ba1eb..1344f2a501 100644 --- a/apps/openmw/mwgui/confirmationdialog.hpp +++ b/apps/openmw/mwgui/confirmationdialog.hpp @@ -12,7 +12,7 @@ namespace MWGui void askForConfirmation(const std::string& message); bool exit() override; - typedef MyGUI::delegates::CMultiDelegate0 EventHandle_Void; + typedef MyGUI::delegates::MultiDelegate<> EventHandle_Void; /** Event : Ok button was clicked.\n signature : void method()\n diff --git a/apps/openmw/mwgui/countdialog.hpp b/apps/openmw/mwgui/countdialog.hpp index bbc6ed90ff..9cdf231549 100644 --- a/apps/openmw/mwgui/countdialog.hpp +++ b/apps/openmw/mwgui/countdialog.hpp @@ -16,7 +16,7 @@ namespace MWGui CountDialog(); void openCountDialog(const std::string& item, const std::string& message, const int maxCount); - typedef MyGUI::delegates::CMultiDelegate2 EventHandle_WidgetInt; + typedef MyGUI::delegates::MultiDelegate EventHandle_WidgetInt; /** Event : Ok button was clicked.\n signature : void method(MyGUI::Widget* _sender, int _count)\n diff --git a/apps/openmw/mwgui/dialogue.hpp b/apps/openmw/mwgui/dialogue.hpp index 45e2578db7..800b67c347 100644 --- a/apps/openmw/mwgui/dialogue.hpp +++ b/apps/openmw/mwgui/dialogue.hpp @@ -79,7 +79,7 @@ namespace MWGui struct Topic : Link { - typedef MyGUI::delegates::CMultiDelegate1 EventHandle_TopicId; + typedef MyGUI::delegates::MultiDelegate EventHandle_TopicId; EventHandle_TopicId eventTopicActivated; Topic(const std::string& id) : mTopicId(id) @@ -91,7 +91,7 @@ namespace MWGui struct Choice : Link { - typedef MyGUI::delegates::CMultiDelegate1 EventHandle_ChoiceId; + typedef MyGUI::delegates::MultiDelegate EventHandle_ChoiceId; EventHandle_ChoiceId eventChoiceActivated; Choice(int id) : mChoiceId(id) @@ -103,7 +103,7 @@ namespace MWGui struct Goodbye : Link { - typedef MyGUI::delegates::CMultiDelegate0 Event_Activated; + typedef MyGUI::delegates::MultiDelegate<> Event_Activated; Event_Activated eventActivated; void activated() override; }; @@ -145,7 +145,7 @@ namespace MWGui bool exit() override; // Events - typedef MyGUI::delegates::CMultiDelegate0 EventHandle_Void; + typedef MyGUI::delegates::MultiDelegate<> EventHandle_Void; void notifyLinkClicked(TypesetBook::InteractiveId link); diff --git a/apps/openmw/mwgui/itemchargeview.hpp b/apps/openmw/mwgui/itemchargeview.hpp index 8c266c4a26..f7617d37eb 100644 --- a/apps/openmw/mwgui/itemchargeview.hpp +++ b/apps/openmw/mwgui/itemchargeview.hpp @@ -50,7 +50,7 @@ namespace MWGui void setSize(const MyGUI::IntSize& value) override; void setCoord(const MyGUI::IntCoord& value) override; - MyGUI::delegates::CMultiDelegate2 eventItemClicked; + MyGUI::delegates::MultiDelegate eventItemClicked; private: struct Line diff --git a/apps/openmw/mwgui/itemselection.hpp b/apps/openmw/mwgui/itemselection.hpp index d418f5dbd6..78f865bb55 100644 --- a/apps/openmw/mwgui/itemselection.hpp +++ b/apps/openmw/mwgui/itemselection.hpp @@ -22,8 +22,8 @@ namespace MWGui bool exit() override; - typedef MyGUI::delegates::CMultiDelegate0 EventHandle_Void; - typedef MyGUI::delegates::CMultiDelegate1 EventHandle_Item; + typedef MyGUI::delegates::MultiDelegate<> EventHandle_Void; + typedef MyGUI::delegates::MultiDelegate EventHandle_Item; EventHandle_Item eventItemSelected; EventHandle_Void eventDialogCanceled; diff --git a/apps/openmw/mwgui/itemview.hpp b/apps/openmw/mwgui/itemview.hpp index 7fb242f51e..cfbc8a37ac 100644 --- a/apps/openmw/mwgui/itemview.hpp +++ b/apps/openmw/mwgui/itemview.hpp @@ -20,8 +20,8 @@ namespace MWGui /// Takes ownership of \a model void setModel(std::unique_ptr model); - typedef MyGUI::delegates::CMultiDelegate1 EventHandle_ModelIndex; - typedef MyGUI::delegates::CMultiDelegate0 EventHandle_Void; + typedef MyGUI::delegates::MultiDelegate EventHandle_ModelIndex; + typedef MyGUI::delegates::MultiDelegate<> EventHandle_Void; /// Fired when an item was clicked EventHandle_ModelIndex eventItemClicked; /// Fired when the background was clicked (useful for drag and drop) diff --git a/apps/openmw/mwgui/mapwindow.hpp b/apps/openmw/mwgui/mapwindow.hpp index f50ad04bce..937b215375 100644 --- a/apps/openmw/mwgui/mapwindow.hpp +++ b/apps/openmw/mwgui/mapwindow.hpp @@ -63,7 +63,7 @@ namespace MWGui RangeType getMarkers(const ESM::RefId& cellId) const; - typedef MyGUI::delegates::CMultiDelegate0 EventHandle_Void; + typedef MyGUI::delegates::MultiDelegate<> EventHandle_Void; EventHandle_Void eventMarkersChanged; private: @@ -214,7 +214,7 @@ namespace MWGui void setText(const std::string& text); std::string getText(); - typedef MyGUI::delegates::CMultiDelegate0 EventHandle_Void; + typedef MyGUI::delegates::MultiDelegate<> EventHandle_Void; EventHandle_Void eventDeleteClicked; EventHandle_Void eventOkClicked; diff --git a/apps/openmw/mwgui/messagebox.hpp b/apps/openmw/mwgui/messagebox.hpp index 220d3e1204..b10586549f 100644 --- a/apps/openmw/mwgui/messagebox.hpp +++ b/apps/openmw/mwgui/messagebox.hpp @@ -40,7 +40,7 @@ namespace MWGui /// @param reset Reset the pressed button to -1 after reading it. int readPressedButton(bool reset = true); - typedef MyGUI::delegates::CMultiDelegate1 EventHandle_Int; + typedef MyGUI::delegates::MultiDelegate EventHandle_Int; // Note: this delegate unassigns itself after it was fired, i.e. works once. EventHandle_Int eventButtonPressed; diff --git a/apps/openmw/mwgui/race.hpp b/apps/openmw/mwgui/race.hpp index aa18c2b173..a6ac0e2813 100644 --- a/apps/openmw/mwgui/race.hpp +++ b/apps/openmw/mwgui/race.hpp @@ -52,7 +52,7 @@ namespace MWGui bool exit() override { return false; } // Events - typedef MyGUI::delegates::CMultiDelegate0 EventHandle_Void; + typedef MyGUI::delegates::MultiDelegate<> EventHandle_Void; /** Event : Back button clicked.\n signature : void method()\n diff --git a/apps/openmw/mwgui/review.hpp b/apps/openmw/mwgui/review.hpp index fe2a509fa6..f1e764012e 100644 --- a/apps/openmw/mwgui/review.hpp +++ b/apps/openmw/mwgui/review.hpp @@ -48,8 +48,8 @@ namespace MWGui void onFrame(float duration) override; // Events - typedef MyGUI::delegates::CMultiDelegate0 EventHandle_Void; - typedef MyGUI::delegates::CMultiDelegate1 EventHandle_Int; + typedef MyGUI::delegates::MultiDelegate<> EventHandle_Void; + typedef MyGUI::delegates::MultiDelegate EventHandle_Int; /** Event : Back button clicked.\n signature : void method()\n diff --git a/apps/openmw/mwgui/spellcreationdialog.hpp b/apps/openmw/mwgui/spellcreationdialog.hpp index cde0fcacd0..6cd1e2a3ac 100644 --- a/apps/openmw/mwgui/spellcreationdialog.hpp +++ b/apps/openmw/mwgui/spellcreationdialog.hpp @@ -35,7 +35,7 @@ namespace MWGui void newEffect(const ESM::MagicEffect* effect); void editEffect(ESM::ENAMstruct effect); - typedef MyGUI::delegates::CMultiDelegate1 EventHandle_Effect; + typedef MyGUI::delegates::MultiDelegate EventHandle_Effect; EventHandle_Effect eventEffectAdded; EventHandle_Effect eventEffectModified; diff --git a/apps/openmw/mwgui/spellview.hpp b/apps/openmw/mwgui/spellview.hpp index 8805aaf2ab..caff43a33e 100644 --- a/apps/openmw/mwgui/spellview.hpp +++ b/apps/openmw/mwgui/spellview.hpp @@ -43,7 +43,7 @@ namespace MWGui /// simplified update called each frame void incrementalUpdate(); - typedef MyGUI::delegates::CMultiDelegate1 EventHandle_ModelIndex; + typedef MyGUI::delegates::MultiDelegate EventHandle_ModelIndex; /// Fired when a spell was clicked EventHandle_ModelIndex eventSpellClicked; diff --git a/apps/openmw/mwgui/textinput.cpp b/apps/openmw/mwgui/textinput.cpp index 6ff4e5304a..18a56e7284 100644 --- a/apps/openmw/mwgui/textinput.cpp +++ b/apps/openmw/mwgui/textinput.cpp @@ -66,7 +66,7 @@ namespace MWGui eventDone(this); } - void TextInputDialog::onTextAccepted(MyGUI::Edit* _sender) + void TextInputDialog::onTextAccepted(MyGUI::EditBox* _sender) { onOkClicked(_sender); diff --git a/apps/openmw/mwgui/textinput.hpp b/apps/openmw/mwgui/textinput.hpp index 0e616305cb..c11d40f1a9 100644 --- a/apps/openmw/mwgui/textinput.hpp +++ b/apps/openmw/mwgui/textinput.hpp @@ -26,7 +26,7 @@ namespace MWGui protected: void onOkClicked(MyGUI::Widget* _sender); - void onTextAccepted(MyGUI::Edit* _sender); + void onTextAccepted(MyGUI::EditBox* _sender); private: MyGUI::EditBox* mTextEdit; diff --git a/apps/openmw/mwgui/timeadvancer.hpp b/apps/openmw/mwgui/timeadvancer.hpp index 56a190a3e3..bb6aa649cb 100644 --- a/apps/openmw/mwgui/timeadvancer.hpp +++ b/apps/openmw/mwgui/timeadvancer.hpp @@ -18,8 +18,8 @@ namespace MWGui bool isRunning() const; // signals - typedef MyGUI::delegates::CMultiDelegate0 EventHandle_Void; - typedef MyGUI::delegates::CMultiDelegate2 EventHandle_IntInt; + typedef MyGUI::delegates::MultiDelegate<> EventHandle_Void; + typedef MyGUI::delegates::MultiDelegate EventHandle_IntInt; EventHandle_IntInt eventProgressChanged; EventHandle_Void eventInterrupted; diff --git a/apps/openmw/mwgui/tradewindow.hpp b/apps/openmw/mwgui/tradewindow.hpp index 62a51be0dd..bc6c4488fd 100644 --- a/apps/openmw/mwgui/tradewindow.hpp +++ b/apps/openmw/mwgui/tradewindow.hpp @@ -44,7 +44,7 @@ namespace MWGui void onDeleteCustomData(const MWWorld::Ptr& ptr) override; - typedef MyGUI::delegates::CMultiDelegate0 EventHandle_TradeDone; + typedef MyGUI::delegates::MultiDelegate<> EventHandle_TradeDone; EventHandle_TradeDone eventTradeDone; private: diff --git a/apps/openmw/mwgui/widgets.hpp b/apps/openmw/mwgui/widgets.hpp index 8e45b37f2d..03c21605f0 100644 --- a/apps/openmw/mwgui/widgets.hpp +++ b/apps/openmw/mwgui/widgets.hpp @@ -106,7 +106,7 @@ namespace MWGui const SkillValue& getSkillValue() const { return mValue; } // Events - typedef MyGUI::delegates::CMultiDelegate1 EventHandle_SkillVoid; + typedef MyGUI::delegates::MultiDelegate EventHandle_SkillVoid; /** Event : Skill clicked.\n signature : void method(MWSkill* _sender)\n @@ -145,7 +145,7 @@ namespace MWGui const AttributeValue& getAttributeValue() const { return mValue; } // Events - typedef MyGUI::delegates::CMultiDelegate1 EventHandle_AttributeVoid; + typedef MyGUI::delegates::MultiDelegate EventHandle_AttributeVoid; /** Event : Attribute clicked.\n signature : void method(MWAttribute* _sender)\n diff --git a/apps/openmw/mwgui/windowbase.hpp b/apps/openmw/mwgui/windowbase.hpp index 4bf622a099..26201b5ff6 100644 --- a/apps/openmw/mwgui/windowbase.hpp +++ b/apps/openmw/mwgui/windowbase.hpp @@ -20,7 +20,7 @@ namespace MWGui virtual MyGUI::Widget* getDefaultKeyFocus() { return nullptr; } // Events - typedef MyGUI::delegates::CMultiDelegate1 EventHandle_WindowBase; + typedef MyGUI::delegates::MultiDelegate EventHandle_WindowBase; /// Open this object in the GUI, for windows that support it virtual void setPtr(const MWWorld::Ptr& ptr) {} diff --git a/components/lua_ui/widget.cpp b/components/lua_ui/widget.cpp index 177a25add5..ae859341e4 100644 --- a/components/lua_ui/widget.cpp +++ b/components/lua_ui/widget.cpp @@ -73,7 +73,11 @@ namespace LuaUi w->eventMouseButtonPressed.clear(); w->eventMouseButtonReleased.clear(); w->eventMouseMove.clear(); +#if MYGUI_VERSION <= MYGUI_DEFINE_VERSION(3, 4, 2) w->eventMouseDrag.m_event.clear(); +#else + w->eventMouseDrag.clear(); +#endif w->eventMouseSetFocus.clear(); w->eventMouseLostFocus.clear(); diff --git a/components/lua_ui/window.cpp b/components/lua_ui/window.cpp index bccd2f5a58..3ee7336a78 100644 --- a/components/lua_ui/window.cpp +++ b/components/lua_ui/window.cpp @@ -16,7 +16,11 @@ namespace LuaUi for (auto& [w, _] : mActionWidgets) { w->eventMouseButtonPressed.clear(); +#if MYGUI_VERSION <= MYGUI_DEFINE_VERSION(3, 4, 2) w->eventMouseDrag.m_event.clear(); +#else + w->eventMouseDrag.clear(); +#endif } mActionWidgets.clear(); diff --git a/components/widgets/fontwrapper.hpp b/components/widgets/fontwrapper.hpp index 6dd14596f4..452014a5ed 100644 --- a/components/widgets/fontwrapper.hpp +++ b/components/widgets/fontwrapper.hpp @@ -41,8 +41,8 @@ namespace Gui = std::to_string(std::clamp(Settings::Manager::getInt("font size", "GUI"), 12, 18)); return fontSize; } - }; #endif + }; } #endif diff --git a/components/widgets/list.hpp b/components/widgets/list.hpp index 217fb1370f..88368e0794 100644 --- a/components/widgets/list.hpp +++ b/components/widgets/list.hpp @@ -15,8 +15,8 @@ namespace Gui public: MWList(); - typedef MyGUI::delegates::CMultiDelegate2 EventHandle_StringInt; - typedef MyGUI::delegates::CMultiDelegate1 EventHandle_Widget; + typedef MyGUI::delegates::MultiDelegate EventHandle_StringInt; + typedef MyGUI::delegates::MultiDelegate EventHandle_Widget; /** * Event: Item selected with the mouse. diff --git a/components/widgets/numericeditbox.hpp b/components/widgets/numericeditbox.hpp index c8f363f8fd..ee8ef39a59 100644 --- a/components/widgets/numericeditbox.hpp +++ b/components/widgets/numericeditbox.hpp @@ -26,7 +26,7 @@ namespace Gui void initialiseOverride() override; void shutdownOverride() override; - typedef MyGUI::delegates::CMultiDelegate1 EventHandle_ValueChanged; + typedef MyGUI::delegates::MultiDelegate EventHandle_ValueChanged; EventHandle_ValueChanged eventValueChanged; /// @note Does not trigger eventValueChanged