diff options
| author | crupest <crupest@outlook.com> | 2020-10-17 15:58:00 +0800 |
|---|---|---|
| committer | crupest <crupest@outlook.com> | 2020-10-17 15:58:00 +0800 |
| commit | bb3d4d561a7c0b0b6cec5561d0a84a1bfc30bf55 (patch) | |
| tree | 6930ab471e66a61f8a3806e532d69d0ff9c634e8 /src | |
| parent | 46ff47d2f47a66372ca0a8a09dd08c4fb04004f3 (diff) | |
| parent | a1f950e2b3b2268b267e647205b14b59c15f8ee1 (diff) | |
| download | cru-bb3d4d561a7c0b0b6cec5561d0a84a1bfc30bf55.tar.gz cru-bb3d4d561a7c0b0b6cec5561d0a84a1bfc30bf55.tar.bz2 cru-bb3d4d561a7c0b0b6cec5561d0a84a1bfc30bf55.zip | |
Merge branch 'master' of https://github.com/crupest/CruUI into master
Diffstat (limited to 'src')
| -rw-r--r-- | src/ui/UiHost.cpp | 2 | ||||
| -rw-r--r-- | src/ui/controls/TextControlService.hpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/ui/UiHost.cpp b/src/ui/UiHost.cpp index 0fdf2f53..48a4e06e 100644 --- a/src/ui/UiHost.cpp +++ b/src/ui/UiHost.cpp @@ -16,7 +16,7 @@ using platform::native::IUiApplication; namespace event_names { #ifdef CRU_DEBUG // clang-format off -#define CRU_DEFINE_EVENT_NAME(name) constexpr const char16_t* name = u#name; +#define CRU_DEFINE_EVENT_NAME(name) constexpr const char16_t* name = CRU_MAKE_UNICODE_LITERAL(name); // clang-format on #else #define CRU_DEFINE_EVENT_NAME(name) constexpr const char16_t* name = u""; diff --git a/src/ui/controls/TextControlService.hpp b/src/ui/controls/TextControlService.hpp index 5e423d7d..5d8d4645 100644 --- a/src/ui/controls/TextControlService.hpp +++ b/src/ui/controls/TextControlService.hpp @@ -199,7 +199,7 @@ class TextControlService : public Object { } template <typename TArgs> - void SetupOneHandler(event::RoutedEvent<TArgs>* (TControl::*event)(), + void SetupOneHandler(event::RoutedEvent<TArgs>* (Control::*event)(), void (TextControlService::*handler)( typename event::RoutedEvent<TArgs>::EventArgs)) { this->event_revoker_guards_.push_back( |