9 files changed, 33 insertions, 33 deletions

diff --git a/src/platform/gui/osx/InputMethod.mm b/src/platform/gui/osx/InputMethod.mm
index 10003a5d..11ba1ad6 100644
--- a/src/platform/gui/osx/InputMethod.mm
+++ b/src/platform/gui/osx/InputMethod.mm
@@ -78,7 +78,7 @@ IEvent<std::nullptr_t>* OsxInputMethodContext::CompositionEvent() {
   return &p_->composition_event_;
 }
 
-IEvent<std::string>* OsxInputMethodContext::TextEvent() { return &p_->text_event_; }
+IEvent<const std::string&>* OsxInputMethodContext::TextEvent() { return &p_->text_event_; }
 
 bool OsxInputMethodContext::IsEnabled() { return p_->is_enabled_; }
 }
diff --git a/src/platform/gui/osx/InputMethodPrivate.h b/src/platform/gui/osx/InputMethodPrivate.h
index 39f3be02..f5726205 100644
--- a/src/platform/gui/osx/InputMethodPrivate.h
+++ b/src/platform/gui/osx/InputMethodPrivate.h
@@ -56,7 +56,7 @@ class OsxInputMethodContextPrivate {
   Event<std::nullptr_t> composition_start_event_;
   Event<std::nullptr_t> composition_event_;
   Event<std::nullptr_t> composition_end_event_;
-  Event<std::string> text_event_;
+  Event<const std::string&> text_event_;
 
   bool is_enabled_ = false;
 };
diff --git a/src/platform/gui/osx/Window.mm b/src/platform/gui/osx/Window.mm
index 600f4902..5f655185 100644
--- a/src/platform/gui/osx/Window.mm
+++ b/src/platform/gui/osx/Window.mm
@@ -379,17 +379,17 @@ IEvent<std::nullptr_t>* OsxWindow::PaintEvent() { return &p_->paint_event_; }
 IEvent<WindowVisibilityType>* OsxWindow::VisibilityChangeEvent() {
   return &p_->visibility_change_event_;
 }
-IEvent<Size>* OsxWindow::ResizeEvent() { return &p_->resize_event_; }
+IEvent<const Size&>* OsxWindow::ResizeEvent() { return &p_->resize_event_; }
 IEvent<FocusChangeType>* OsxWindow::FocusEvent() { return &p_->focus_event_; }
 IEvent<MouseEnterLeaveType>* OsxWindow::MouseEnterLeaveEvent() {
   return &p_->mouse_enter_leave_event_;
 }
-IEvent<Point>* OsxWindow::MouseMoveEvent() { return &p_->mouse_move_event_; }
-IEvent<NativeMouseButtonEventArgs>* OsxWindow::MouseDownEvent() { return &p_->mouse_down_event_; }
-IEvent<NativeMouseButtonEventArgs>* OsxWindow::MouseUpEvent() { return &p_->mouse_up_event_; }
-IEvent<NativeMouseWheelEventArgs>* OsxWindow::MouseWheelEvent() { return &p_->mouse_wheel_event_; }
-IEvent<NativeKeyEventArgs>* OsxWindow::KeyDownEvent() { return &p_->key_down_event_; }
-IEvent<NativeKeyEventArgs>* OsxWindow::KeyUpEvent() { return &p_->key_up_event_; }
+IEvent<const Point&>* OsxWindow::MouseMoveEvent() { return &p_->mouse_move_event_; }
+IEvent<const NativeMouseButtonEventArgs&>* OsxWindow::MouseDownEvent() { return &p_->mouse_down_event_; }
+IEvent<const NativeMouseButtonEventArgs&>* OsxWindow::MouseUpEvent() { return &p_->mouse_up_event_; }
+IEvent<const NativeMouseWheelEventArgs&>* OsxWindow::MouseWheelEvent() { return &p_->mouse_wheel_event_; }
+IEvent<const NativeKeyEventArgs&>* OsxWindow::KeyDownEvent() { return &p_->key_down_event_; }
+IEvent<const NativeKeyEventArgs&>* OsxWindow::KeyUpEvent() { return &p_->key_up_event_; }
 
 IInputMethodContext* OsxWindow::GetInputMethodContext() { return p_->input_method_context_.get(); }
 }  // namespace cru::platform::gui::osx
diff --git a/src/platform/gui/osx/WindowPrivate.h b/src/platform/gui/osx/WindowPrivate.h
index 913f2b2b..94b7e948 100644
--- a/src/platform/gui/osx/WindowPrivate.h
+++ b/src/platform/gui/osx/WindowPrivate.h
@@ -103,15 +103,15 @@ class OsxWindowPrivate {
   Event<std::nullptr_t> destroy_event_;
   Event<std::nullptr_t> paint_event_;
   Event<WindowVisibilityType> visibility_change_event_;
-  Event<Size> resize_event_;
+  Event<const Size&> resize_event_;
   Event<FocusChangeType> focus_event_;
   Event<MouseEnterLeaveType> mouse_enter_leave_event_;
-  Event<Point> mouse_move_event_;
-  Event<NativeMouseButtonEventArgs> mouse_down_event_;
-  Event<NativeMouseButtonEventArgs> mouse_up_event_;
-  Event<NativeMouseWheelEventArgs> mouse_wheel_event_;
-  Event<NativeKeyEventArgs> key_down_event_;
-  Event<NativeKeyEventArgs> key_up_event_;
+  Event<const Point&> mouse_move_event_;
+  Event<const NativeMouseButtonEventArgs&> mouse_down_event_;
+  Event<const NativeMouseButtonEventArgs&> mouse_up_event_;
+  Event<const NativeMouseWheelEventArgs&> mouse_wheel_event_;
+  Event<const NativeKeyEventArgs&> key_down_event_;
+  Event<const NativeKeyEventArgs&> key_up_event_;
 };
 }  // namespace details
 }  // namespace cru::platform::gui::osx
diff --git a/src/platform/gui/sdl/Window.cpp b/src/platform/gui/sdl/Window.cpp
index 1c2d53bc..e0898cb1 100644
--- a/src/platform/gui/sdl/Window.cpp
+++ b/src/platform/gui/sdl/Window.cpp
@@ -132,7 +132,7 @@ IEvent<WindowVisibilityType> *SdlWindow::VisibilityChangeEvent() {
   return &visibility_change_event_;
 }
 
-IEvent<Size> *SdlWindow::ResizeEvent() { return &resize_event_; }
+IEvent<const Size&> *SdlWindow::ResizeEvent() { return &resize_event_; }
 
 IEvent<FocusChangeType> *SdlWindow::FocusEvent() { return &focus_event_; }
 
@@ -140,25 +140,25 @@ IEvent<MouseEnterLeaveType> *SdlWindow::MouseEnterLeaveEvent() {
   return &mouse_enter_leave_event_;
 }
 
-IEvent<Point> *SdlWindow::MouseMoveEvent() { return &mouse_move_event_; }
+IEvent<const Point&> *SdlWindow::MouseMoveEvent() { return &mouse_move_event_; }
 
-IEvent<NativeMouseButtonEventArgs> *SdlWindow::MouseDownEvent() {
+IEvent<const NativeMouseButtonEventArgs&> *SdlWindow::MouseDownEvent() {
   return &mouse_down_event_;
 }
 
-IEvent<NativeMouseButtonEventArgs> *SdlWindow::MouseUpEvent() {
+IEvent<const NativeMouseButtonEventArgs&> *SdlWindow::MouseUpEvent() {
   return &mouse_up_event_;
 }
 
-IEvent<NativeMouseWheelEventArgs> *SdlWindow::MouseWheelEvent() {
+IEvent<const NativeMouseWheelEventArgs&> *SdlWindow::MouseWheelEvent() {
   return &mouse_wheel_event_;
 }
 
-IEvent<NativeKeyEventArgs> *SdlWindow::KeyDownEvent() {
+IEvent<const NativeKeyEventArgs&> *SdlWindow::KeyDownEvent() {
   return &key_down_event_;
 }
 
-IEvent<NativeKeyEventArgs> *SdlWindow::KeyUpEvent() { return &key_up_event_; }
+IEvent<const NativeKeyEventArgs&> *SdlWindow::KeyUpEvent() { return &key_up_event_; }
 
 IInputMethodContext *SdlWindow::GetInputMethodContext() { NotImplemented(); }
 
diff --git a/src/platform/gui/win/InputMethod.cpp b/src/platform/gui/win/InputMethod.cpp
index e5b75cdb..1d7e2629 100644
--- a/src/platform/gui/win/InputMethod.cpp
+++ b/src/platform/gui/win/InputMethod.cpp
@@ -230,7 +230,7 @@ IEvent<std::nullptr_t>* WinInputMethodContext::CompositionEvent() {
   return &composition_event_;
 }
 
-IEvent<std::string>* WinInputMethodContext::TextEvent() { return &text_event_; }
+IEvent<const std::string&>* WinInputMethodContext::TextEvent() { return &text_event_; }
 
 void WinInputMethodContext::OnWindowNativeMessage(
     WindowNativeMessageEventArgs& args) {
diff --git a/src/platform/gui/win/TimerManager.h b/src/platform/gui/win/TimerManager.h
index d5a07f7f..9b049310 100644
--- a/src/platform/gui/win/TimerManager.h
+++ b/src/platform/gui/win/TimerManager.h
@@ -46,7 +46,7 @@ class TimerManager : public Object {
  private:
   GodWindow* god_window_;
 
-  EventRevokerListGuard event_guard_;
+  EventHandlerRevokerListGuard event_guard_;
 
   long long next_id_ = 1;
   std::unordered_map<long long, TimerInfo> info_map_;
diff --git a/src/platform/gui/xcb/InputMethod.cpp b/src/platform/gui/xcb/InputMethod.cpp
index d6d4b9e7..96d04348 100644
--- a/src/platform/gui/xcb/InputMethod.cpp
+++ b/src/platform/gui/xcb/InputMethod.cpp
@@ -204,7 +204,7 @@ IEvent<std::nullptr_t> *XcbXimInputMethodContext::CompositionEvent() {
   return &composition_event_;
 }
 
-IEvent<std::string> *XcbXimInputMethodContext::TextEvent() {
+IEvent<const std::string&> *XcbXimInputMethodContext::TextEvent() {
   return &text_event_;
 }
 
diff --git a/src/platform/gui/xcb/Window.cpp b/src/platform/gui/xcb/Window.cpp
index 96483e04..44db5af3 100644
--- a/src/platform/gui/xcb/Window.cpp
+++ b/src/platform/gui/xcb/Window.cpp
@@ -311,7 +311,7 @@ IEvent<WindowVisibilityType> *XcbWindow::VisibilityChangeEvent() {
   return &visibility_change_event_;
 }
 
-IEvent<Size> *XcbWindow::ResizeEvent() { return &resize_event_; }
+IEvent<const Size&> *XcbWindow::ResizeEvent() { return &resize_event_; }
 
 IEvent<FocusChangeType> *XcbWindow::FocusEvent() { return &focus_event_; }
 
@@ -319,25 +319,25 @@ IEvent<MouseEnterLeaveType> *XcbWindow::MouseEnterLeaveEvent() {
   return &mouse_enter_leave_event_;
 }
 
-IEvent<Point> *XcbWindow::MouseMoveEvent() { return &mouse_move_event_; }
+IEvent<const Point&> *XcbWindow::MouseMoveEvent() { return &mouse_move_event_; }
 
-IEvent<NativeMouseButtonEventArgs> *XcbWindow::MouseDownEvent() {
+IEvent<const NativeMouseButtonEventArgs&> *XcbWindow::MouseDownEvent() {
   return &mouse_down_event_;
 }
 
-IEvent<NativeMouseButtonEventArgs> *XcbWindow::MouseUpEvent() {
+IEvent<const NativeMouseButtonEventArgs&> *XcbWindow::MouseUpEvent() {
   return &mouse_up_event_;
 }
 
-IEvent<NativeMouseWheelEventArgs> *XcbWindow::MouseWheelEvent() {
+IEvent<const NativeMouseWheelEventArgs&> *XcbWindow::MouseWheelEvent() {
   return &mouse_wheel_event_;
 }
 
-IEvent<NativeKeyEventArgs> *XcbWindow::KeyDownEvent() {
+IEvent<const NativeKeyEventArgs&> *XcbWindow::KeyDownEvent() {
   return &key_down_event_;
 }
 
-IEvent<NativeKeyEventArgs> *XcbWindow::KeyUpEvent() { return &key_up_event_; }
+IEvent<const NativeKeyEventArgs&> *XcbWindow::KeyUpEvent() { return &key_up_event_; }
 
 IInputMethodContext *XcbWindow::GetInputMethodContext() {
   return input_method_;