Event.hpp: Set event object

1 files changed, 18 insertions, 10 deletions

diff --git a/src/slic3r/GUI/Event.hpp b/src/slic3r/GUI/Event.hpp
index ffcad7f9f..63800fa00 100644
--- a/src/slic3r/GUI/Event.hpp
+++ b/src/slic3r/GUI/Event.hpp
@@ -1,6 +1,7 @@
 #ifndef slic3r_Events_hpp_
 #define slic3r_Events_hpp_
 
+
 #include <wx/event.h>
 
 
@@ -11,11 +12,14 @@ namespace GUI {
 
 struct SimpleEvent : public wxEvent
 {
-    SimpleEvent(wxEventType type, int id = 0) : wxEvent(id, type) {}
+    SimpleEvent(wxEventType type, wxObject* origin = nullptr) : wxEvent(0, type)
+    {
+        SetEventObject(origin);
+    }
 
     virtual wxEvent* Clone() const
     {
-        return new SimpleEvent(GetEventType(), GetId());
+        return new SimpleEvent(GetEventType(), GetEventObject());
     }
 };
 
@@ -23,26 +27,30 @@ template<class T, size_t N> struct ArrayEvent : public wxEvent
 {
     std::array<T, N> data;
 
-    ArrayEvent(wxEventType type, std::array<T, N> data, int id = 0)
-        : wxEvent(id, type), data(std::move(data))
-    {}
+    ArrayEvent(wxEventType type, std::array<T, N> data, wxObject* origin = nullptr)
+        : wxEvent(0, type), data(std::move(data))
+    {
+        SetEventObject(origin);
+    }
 
     virtual wxEvent* Clone() const
     {
-        return new ArrayEvent<T, N>(GetEventType(), data, GetId());
+        return new ArrayEvent<T, N>(GetEventType(), data, GetEventObject());
     }
 };
 template<class T> struct ArrayEvent<T, 1> : public wxEvent
 {
     T data;
 
-    ArrayEvent(wxEventType type, T data, int id = 0)
-        : wxEvent(id, type), data(std::move(data))
-    {}
+    ArrayEvent(wxEventType type, T data, wxObject* origin = nullptr)
+        : wxEvent(0, type), data(std::move(data))
+    {
+        SetEventObject(origin);
+    }
 
     virtual wxEvent* Clone() const
     {
-        return new ArrayEvent<T, 1>(GetEventType(), data, GetId());
+        return new ArrayEvent<T, 1>(GetEventType(), data, GetEventObject());
     }
 };