From 8707c37dcf279724cec4c1c69d71eab74491d1b8 Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Fri, 28 Jul 2023 15:15:30 +0200
Subject: [PATCH] clean up

---
 components/lua_ui/widget.cpp   | 4 ++++
 components/lua_ui/window.cpp   | 4 ++++
 components/widgets/box.cpp     | 6 ------
 components/widgets/box.hpp     | 8 --------
 components/widgets/widgets.cpp | 1 -
 5 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/components/lua_ui/widget.cpp b/components/lua_ui/widget.cpp
index 17629f453f..ff9f4d90a2 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/box.cpp b/components/widgets/box.cpp
index 8522ed3592..642721b807 100644
--- a/components/widgets/box.cpp
+++ b/components/widgets/box.cpp
@@ -1,15 +1,9 @@
 #include "box.hpp"
 
 #include <MyGUI_EditText.h>
-#include <MyGUI_LanguageManager.h>
 
 namespace Gui
 {
-    void ComboBox::setPropertyOverride(const std::string& _key, const std::string& _value)
-    {
-        MyGUI::ComboBox::setPropertyOverride(_key, _value);
-    }
-
     void AutoSizedWidget::notifySizeChange(MyGUI::Widget* w)
     {
         MyGUI::Widget* parent = w->getParent();
diff --git a/components/widgets/box.hpp b/components/widgets/box.hpp
index c004033eed..b5fcc8e9b6 100644
--- a/components/widgets/box.hpp
+++ b/components/widgets/box.hpp
@@ -11,14 +11,6 @@
 
 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>
     {
         MYGUI_RTTI_DERIVED(Button)
diff --git a/components/widgets/widgets.cpp b/components/widgets/widgets.cpp
index 8a7ebd9ccb..d27d7e5fc9 100644
--- a/components/widgets/widgets.cpp
+++ b/components/widgets/widgets.cpp
@@ -28,7 +28,6 @@ namespace Gui
         MyGUI::FactoryManager::getInstance().registerFactory<Gui::NumericEditBox>("Widget");
         MyGUI::FactoryManager::getInstance().registerFactory<Gui::SharedStateButton>("Widget");
         MyGUI::FactoryManager::getInstance().registerFactory<Gui::WindowCaption>("Widget");
-        MyGUI::FactoryManager::getInstance().registerFactory<Gui::ComboBox>("Widget");
     }
 
 }