aboutsummaryrefslogtreecommitdiff
path: root/include/cru/win/native
diff options
context:
space:
mode:
authorcrupest <crupest@outlook.com>2020-07-05 23:06:02 +0800
committercrupest <crupest@outlook.com>2020-07-05 23:06:02 +0800
commit5c805e494425a88da1813902b1ad8a1ab351e30d (patch)
treebe3cfd96dcac19db3e256d610d48b5083c489a6c /include/cru/win/native
parentbbec59718bf8a824583869126762013112f8e568 (diff)
downloadcru-5c805e494425a88da1813902b1ad8a1ab351e30d.tar.gz
cru-5c805e494425a88da1813902b1ad8a1ab351e30d.tar.bz2
cru-5c805e494425a88da1813902b1ad8a1ab351e30d.zip
...
Diffstat (limited to 'include/cru/win/native')
-rw-r--r--include/cru/win/native/Cursor.hpp2
-rw-r--r--include/cru/win/native/GodWindow.hpp2
-rw-r--r--include/cru/win/native/InputMethod.hpp10
-rw-r--r--include/cru/win/native/Resource.hpp4
-rw-r--r--include/cru/win/native/Window.hpp2
5 files changed, 10 insertions, 10 deletions
diff --git a/include/cru/win/native/Cursor.hpp b/include/cru/win/native/Cursor.hpp
index 44a6a362..373b9170 100644
--- a/include/cru/win/native/Cursor.hpp
+++ b/include/cru/win/native/Cursor.hpp
@@ -7,7 +7,7 @@
namespace cru::platform::native::win {
class WinCursor : public WinNativeResource, public virtual ICursor {
- CRU_DEFINE_CLASS_LOG_TAG("cru::platform::native::win::WinCursor")
+ CRU_DEFINE_CLASS_LOG_TAG(u"cru::platform::native::win::WinCursor")
public:
WinCursor(HCURSOR handle, bool auto_destroy);
diff --git a/include/cru/win/native/GodWindow.hpp b/include/cru/win/native/GodWindow.hpp
index 0820bdb3..8b20e01f 100644
--- a/include/cru/win/native/GodWindow.hpp
+++ b/include/cru/win/native/GodWindow.hpp
@@ -5,7 +5,7 @@
namespace cru::platform::native::win {
class GodWindow : public Object {
- CRU_DEFINE_CLASS_LOG_TAG("cru::platform::native::win::GodWindow")
+ CRU_DEFINE_CLASS_LOG_TAG(u"cru::platform::native::win::GodWindow")
public:
explicit GodWindow(WinUiApplication* application);
diff --git a/include/cru/win/native/InputMethod.hpp b/include/cru/win/native/InputMethod.hpp
index 45422ace..113f460d 100644
--- a/include/cru/win/native/InputMethod.hpp
+++ b/include/cru/win/native/InputMethod.hpp
@@ -12,7 +12,7 @@
namespace cru::platform::native::win {
class AutoHIMC : public Object {
- CRU_DEFINE_CLASS_LOG_TAG("cru::platform::native::win::AutoHIMC")
+ CRU_DEFINE_CLASS_LOG_TAG(u"cru::platform::native::win::AutoHIMC")
public:
explicit AutoHIMC(HWND hwnd);
@@ -35,7 +35,7 @@ class AutoHIMC : public Object {
class WinInputMethodContext : public WinNativeResource,
public virtual IInputMethodContext {
- CRU_DEFINE_CLASS_LOG_TAG("cru::platform::native::win::WinInputMethodContext")
+ CRU_DEFINE_CLASS_LOG_TAG(u"cru::platform::native::win::WinInputMethodContext")
public:
WinInputMethodContext(gsl::not_null<WinNativeWindow*> window);
@@ -65,12 +65,12 @@ class WinInputMethodContext : public WinNativeResource,
IEvent<std::nullptr_t>* CompositionEvent() override;
- IEvent<std::string_view>* TextEvent() override;
+ IEvent<std::u16string_view>* TextEvent() override;
private:
void OnWindowNativeMessage(WindowNativeMessageEventArgs& args);
- std::string GetResultString();
+ std::u16string GetResultString();
std::optional<AutoHIMC> TryGetHIMC();
@@ -82,7 +82,7 @@ class WinInputMethodContext : public WinNativeResource,
Event<std::nullptr_t> composition_start_event_;
Event<std::nullptr_t> composition_end_event_;
Event<std::nullptr_t> composition_event_;
- Event<std::string_view> text_event_;
+ Event<std::u16string_view> text_event_;
};
class WinInputMethodManager : public WinNativeResource,
diff --git a/include/cru/win/native/Resource.hpp b/include/cru/win/native/Resource.hpp
index 7afaca0f..0de0e1a8 100644
--- a/include/cru/win/native/Resource.hpp
+++ b/include/cru/win/native/Resource.hpp
@@ -6,7 +6,7 @@
namespace cru::platform::native::win {
class WinNativeResource : public Object, public virtual INativeResource {
public:
- static constexpr std::string_view k_platform_id = "Windows";
+ static constexpr std::u16string_view k_platform_id = u"Windows";
protected:
WinNativeResource() = default;
@@ -18,6 +18,6 @@ class WinNativeResource : public Object, public virtual INativeResource {
~WinNativeResource() override = default;
public:
- std::string_view GetPlatformId() const final { return k_platform_id; }
+ std::u16string_view GetPlatformId() const final { return k_platform_id; }
};
} // namespace cru::platform::native::win
diff --git a/include/cru/win/native/Window.hpp b/include/cru/win/native/Window.hpp
index 521a0a06..3e0b11cd 100644
--- a/include/cru/win/native/Window.hpp
+++ b/include/cru/win/native/Window.hpp
@@ -8,7 +8,7 @@
namespace cru::platform::native::win {
class WinNativeWindow : public WinNativeResource, public virtual INativeWindow {
- CRU_DEFINE_CLASS_LOG_TAG("cru::platform::native::win::WinNativeWindow")
+ CRU_DEFINE_CLASS_LOG_TAG(u"cru::platform::native::win::WinNativeWindow")
public:
WinNativeWindow(WinUiApplication* application, WindowClass* window_class,