diff options
Diffstat (limited to 'include/cru/ui/helper')
| -rw-r--r-- | include/cru/ui/helper/ClickDetector.h | 6 | ||||
| -rw-r--r-- | include/cru/ui/helper/ShortcutHub.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/cru/ui/helper/ClickDetector.h b/include/cru/ui/helper/ClickDetector.h index eaf1f4af..2eb453d9 100644 --- a/include/cru/ui/helper/ClickDetector.h +++ b/include/cru/ui/helper/ClickDetector.h @@ -57,7 +57,7 @@ class ClickDetector : public Object { // deactivated. void SetTriggerButton(MouseButton trigger_button); - IEvent<ClickEventArgs>* ClickEvent() { return &event_; } + IEvent<const ClickEventArgs&>* ClickEvent() { return &event_; } IEvent<ClickState>* StateChangeEvent() { return &state_change_event_; } @@ -72,10 +72,10 @@ class ClickDetector : public Object { bool enable_ = true; MouseButton trigger_button_ = MouseButtons::Left | MouseButtons::Right; - Event<ClickEventArgs> event_; + Event<const ClickEventArgs&> event_; Event<ClickState> state_change_event_; - std::vector<EventRevokerGuard> event_rovoker_guards_; + std::vector<EventHandlerRevokerGuard> event_rovoker_guards_; Point down_point_; MouseButton button_; diff --git a/include/cru/ui/helper/ShortcutHub.h b/include/cru/ui/helper/ShortcutHub.h index d2c9952b..1b600c48 100644 --- a/include/cru/ui/helper/ShortcutHub.h +++ b/include/cru/ui/helper/ShortcutHub.h @@ -131,6 +131,6 @@ class CRU_UI_API ShortcutHub : public Object { Event<events::KeyEventArgs&> fallback_event_; - EventRevokerListGuard event_guard_; + EventHandlerRevokerListGuard event_guard_; }; } // namespace cru::ui::helper |
