aboutsummaryrefslogtreecommitdiff
path: root/src/platform/gui/osx
diff options
context:
space:
mode:
Diffstat (limited to 'src/platform/gui/osx')
-rw-r--r--src/platform/gui/osx/InputMethod.mm2
-rw-r--r--src/platform/gui/osx/InputMethodPrivate.h2
-rw-r--r--src/platform/gui/osx/Window.mm14
-rw-r--r--src/platform/gui/osx/WindowPrivate.h14
4 files changed, 16 insertions, 16 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