2 files changed, 8 insertions, 8 deletions

diff --git a/include/cru/platform/gui/win/InputMethod.h b/include/cru/platform/gui/win/InputMethod.h
index c246cbd7..fa4d5882 100644
--- a/include/cru/platform/gui/win/InputMethod.h
+++ b/include/cru/platform/gui/win/InputMethod.h
@@ -66,7 +66,7 @@ class CRU_WIN_GUI_API WinInputMethodContext
 
   IEvent<std::nullptr_t>* CompositionEvent() override;
 
-  IEvent<std::string>* TextEvent() override;
+  IEvent<const std::string&>* TextEvent() override;
 
  private:
   void OnWindowNativeMessage(WindowNativeMessageEventArgs& args);
@@ -78,11 +78,11 @@ class CRU_WIN_GUI_API WinInputMethodContext
  private:
   WinNativeWindow* native_window_;
 
-  EventRevokerListGuard event_guard_;
+  EventHandlerRevokerListGuard event_guard_;
 
   Event<std::nullptr_t> composition_start_event_;
   Event<std::nullptr_t> composition_end_event_;
   Event<std::nullptr_t> composition_event_;
-  Event<std::string> text_event_;
+  Event<const std::string&> text_event_;
 };
 }  // namespace cru::platform::gui::win
diff --git a/include/cru/platform/gui/win/Window.h b/include/cru/platform/gui/win/Window.h
index cd720fbd..f315f3d3 100644
--- a/include/cru/platform/gui/win/Window.h
+++ b/include/cru/platform/gui/win/Window.h
@@ -69,19 +69,19 @@ class CRU_WIN_GUI_API WinNativeWindow : public WinNativeResource,
   IEvent<WindowVisibilityType>* VisibilityChangeEvent() override {
     return &visibility_change_event_;
   }
-  IEvent<Size>* ResizeEvent() override { return &resize_event_; }
+  IEvent<const Size&>* ResizeEvent() override { return &resize_event_; }
   IEvent<FocusChangeType>* FocusEvent() override { return &focus_event_; }
   IEvent<MouseEnterLeaveType>* MouseEnterLeaveEvent() override {
     return &mouse_enter_leave_event_;
   }
-  IEvent<Point>* MouseMoveEvent() override { return &mouse_move_event_; }
+  IEvent<const Point&>* MouseMoveEvent() override { return &mouse_move_event_; }
   IEvent<platform::gui::NativeMouseButtonEventArgs>* MouseDownEvent() override {
     return &mouse_down_event_;
   }
   IEvent<platform::gui::NativeMouseButtonEventArgs>* MouseUpEvent() override {
     return &mouse_up_event_;
   }
-  IEvent<NativeMouseWheelEventArgs>* MouseWheelEvent() override {
+  IEvent<const NativeMouseWheelEventArgs&>* MouseWheelEvent() override {
     return &mouse_wheel_event_;
   }
 
@@ -200,11 +200,11 @@ class CRU_WIN_GUI_API WinNativeWindow : public WinNativeResource,
   Event<std::nullptr_t> create_event_;
   Event<std::nullptr_t> destroy_event_;
   Event<std::nullptr_t> paint_event_;
-  Event<Size> resize_event_;
+  Event<const Size&> resize_event_;
   Event<WindowVisibilityType> visibility_change_event_;
   Event<FocusChangeType> focus_event_;
   Event<MouseEnterLeaveType> mouse_enter_leave_event_;
-  Event<Point> mouse_move_event_;
+  Event<const Point&> mouse_move_event_;
   Event<platform::gui::NativeMouseButtonEventArgs> mouse_down_event_;
   Event<platform::gui::NativeMouseButtonEventArgs> mouse_up_event_;
   Event<platform::gui::NativeMouseWheelEventArgs> mouse_wheel_event_;