mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-31 09:45:40 +00:00
Code Issues Releases Wiki Activity

clean up

Browse source
This commit is contained in:
Bret Curtis 2023-07-28 15:15:30 +02:00
parent 7d1edaa788
commit 8707c37dcf
5 changed files with 8 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
components/lua_ui/widget.cpp
View file

@ -73,7 +73,11 @@ namespace LuaUi
w->eventMouseButtonPressed.clear(); w->eventMouseButtonPressed.clear();
w->eventMouseButtonReleased.clear(); w->eventMouseButtonReleased.clear();
w->eventMouseMove.clear(); w->eventMouseMove.clear();
#if MYGUI_VERSION <= MYGUI_DEFINE_VERSION(3, 4, 2)
w->eventMouseDrag.m_event.clear(); w->eventMouseDrag.m_event.clear();
#else
w->eventMouseDrag.clear();
#endif
w->eventMouseSetFocus.clear(); w->eventMouseSetFocus.clear();
w->eventMouseLostFocus.clear(); w->eventMouseLostFocus.clear();

4
components/lua_ui/window.cpp
View file

@ -16,7 +16,11 @@ namespace LuaUi
for (auto& [w, _] : mActionWidgets) for (auto& [w, _] : mActionWidgets)
{ {
w->eventMouseButtonPressed.clear(); w->eventMouseButtonPressed.clear();
#if MYGUI_VERSION <= MYGUI_DEFINE_VERSION(3, 4, 2)
w->eventMouseDrag.m_event.clear(); w->eventMouseDrag.m_event.clear();
#else
w->eventMouseDrag.clear();
#endif
} }
mActionWidgets.clear(); mActionWidgets.clear();

6
components/widgets/box.cpp
View file

@ -1,15 +1,9 @@
#include "box.hpp" #include "box.hpp"
#include <MyGUI_EditText.h> #include <MyGUI_EditText.h>
#include <MyGUI_LanguageManager.h>
namespace Gui namespace Gui
{ {
void ComboBox::setPropertyOverride(const std::string& _key, const std::string& _value)
{
MyGUI::ComboBox::setPropertyOverride(_key, _value);
}
void AutoSizedWidget::notifySizeChange(MyGUI::Widget* w) void AutoSizedWidget::notifySizeChange(MyGUI::Widget* w)
{ {
MyGUI::Widget* parent = w->getParent(); MyGUI::Widget* parent = w->getParent();

8
components/widgets/box.hpp
View file

@ -11,14 +11,6 @@
namespace Gui namespace Gui
{ {
class ComboBox : public FontWrapper<MyGUI::ComboBox>
{
MYGUI_RTTI_DERIVED(ComboBox)
protected:
void setPropertyOverride(const std::string& _key, const std::string& _value) override;
};
class Button : public FontWrapper<MyGUI::Button> class Button : public FontWrapper<MyGUI::Button>
{ {
MYGUI_RTTI_DERIVED(Button) MYGUI_RTTI_DERIVED(Button)

1
components/widgets/widgets.cpp
View file

@ -28,7 +28,6 @@ namespace Gui
MyGUI::FactoryManager::getInstance().registerFactory<Gui::NumericEditBox>("Widget"); MyGUI::FactoryManager::getInstance().registerFactory<Gui::NumericEditBox>("Widget");
MyGUI::FactoryManager::getInstance().registerFactory<Gui::SharedStateButton>("Widget"); MyGUI::FactoryManager::getInstance().registerFactory<Gui::SharedStateButton>("Widget");
MyGUI::FactoryManager::getInstance().registerFactory<Gui::WindowCaption>("Widget"); MyGUI::FactoryManager::getInstance().registerFactory<Gui::WindowCaption>("Widget");
MyGUI::FactoryManager::getInstance().registerFactory<Gui::ComboBox>("Widget");
} }
} }