diff options
author | Yuqian Yang <crupest@crupest.life> | 2025-10-17 22:57:30 +0800 |
---|---|---|
committer | Yuqian Yang <crupest@crupest.life> | 2025-10-17 22:57:30 +0800 |
commit | ca9334f53b9456a517f8fa4a687e2d2a6cc1ca86 (patch) | |
tree | a49651d6af538f90f4033e1ff6361d309ed3fed9 /include/cru/platform/gui | |
parent | 728d592f4075ae78b67dab6911ada05875a470a3 (diff) | |
download | cru-ca9334f53b9456a517f8fa4a687e2d2a6cc1ca86.tar.gz cru-ca9334f53b9456a517f8fa4a687e2d2a6cc1ca86.tar.bz2 cru-ca9334f53b9456a517f8fa4a687e2d2a6cc1ca86.zip |
Fix windows build.
Diffstat (limited to 'include/cru/platform/gui')
-rw-r--r-- | include/cru/platform/gui/win/Clipboard.h | 4 | ||||
-rw-r--r-- | include/cru/platform/gui/win/GodWindow.h | 1 | ||||
-rw-r--r-- | include/cru/platform/gui/win/InputMethod.h | 6 | ||||
-rw-r--r-- | include/cru/platform/gui/win/Resource.h | 4 | ||||
-rw-r--r-- | include/cru/platform/gui/win/Window.h | 7 |
5 files changed, 10 insertions, 12 deletions
diff --git a/include/cru/platform/gui/win/Clipboard.h b/include/cru/platform/gui/win/Clipboard.h index ebaa3f4f..50a3aeea 100644 --- a/include/cru/platform/gui/win/Clipboard.h +++ b/include/cru/platform/gui/win/Clipboard.h @@ -16,8 +16,8 @@ class WinClipboard : public WinNativeResource, public virtual IClipboard { ~WinClipboard() override; public: - String GetText() override; - void SetText(String text) override; + std::string GetText() override; + void SetText(std::string text) override; private: WinUiApplication* application_; diff --git a/include/cru/platform/gui/win/GodWindow.h b/include/cru/platform/gui/win/GodWindow.h index 05f9a13d..ceb6fe2d 100644 --- a/include/cru/platform/gui/win/GodWindow.h +++ b/include/cru/platform/gui/win/GodWindow.h @@ -3,7 +3,6 @@ #include "WindowNativeMessageEventArgs.h" #include "cru/base/Event.h" -#include "cru/base/String.h" #include <memory> diff --git a/include/cru/platform/gui/win/InputMethod.h b/include/cru/platform/gui/win/InputMethod.h index 565a4cd0..a69490c7 100644 --- a/include/cru/platform/gui/win/InputMethod.h +++ b/include/cru/platform/gui/win/InputMethod.h @@ -66,12 +66,12 @@ class CRU_WIN_GUI_API WinInputMethodContext IEvent<std::nullptr_t>* CompositionEvent() override; - IEvent<StringView>* TextEvent() override; + IEvent<std::string>* TextEvent() override; private: void OnWindowNativeMessage(WindowNativeMessageEventArgs& args); - String GetResultString(); + std::string GetResultString(); AutoHIMC GetHIMC(); @@ -83,6 +83,6 @@ class CRU_WIN_GUI_API WinInputMethodContext Event<std::nullptr_t> composition_start_event_; Event<std::nullptr_t> composition_end_event_; Event<std::nullptr_t> composition_event_; - Event<StringView> text_event_; + Event<std::string> text_event_; }; } // namespace cru::platform::gui::win diff --git a/include/cru/platform/gui/win/Resource.h b/include/cru/platform/gui/win/Resource.h index ed43bec3..16cde194 100644 --- a/include/cru/platform/gui/win/Resource.h +++ b/include/cru/platform/gui/win/Resource.h @@ -7,7 +7,7 @@ namespace cru::platform::gui::win { class CRU_WIN_GUI_API WinNativeResource : public Object, public virtual IPlatformResource { public: - static String kPlatformId; + static std::string kPlatformId; protected: WinNativeResource() = default; @@ -19,6 +19,6 @@ class CRU_WIN_GUI_API WinNativeResource : public Object, ~WinNativeResource() override = default; public: - String GetPlatformId() const final { return kPlatformId; } + std::string GetPlatformId() const final { return kPlatformId; } }; } // namespace cru::platform::gui::win diff --git a/include/cru/platform/gui/win/Window.h b/include/cru/platform/gui/win/Window.h index 74d58228..cd720fbd 100644 --- a/include/cru/platform/gui/win/Window.h +++ b/include/cru/platform/gui/win/Window.h @@ -2,7 +2,6 @@ #include "Resource.h" #include "WindowNativeMessageEventArgs.h" -#include "cru/platform/gui/Base.h" #include "cru/platform/gui/Window.h" #include "cru/platform/graphics/direct2d/WindowRenderTarget.h" @@ -30,8 +29,8 @@ class CRU_WIN_GUI_API WinNativeWindow : public WinNativeResource, WindowStyleFlag GetStyleFlag() override { return style_flag_; } void SetStyleFlag(WindowStyleFlag flag) override; - String GetTitle() override; - void SetTitle(String title) override; + std::string GetTitle() override; + void SetTitle(std::string title) override; WindowVisibilityType GetVisibility() override { return visibility_; } void SetVisibility(WindowVisibilityType visibility) override; @@ -181,7 +180,7 @@ class CRU_WIN_GUI_API WinNativeWindow : public WinNativeResource, WindowStyleFlag style_flag_{}; WindowVisibilityType visibility_ = WindowVisibilityType::Hide; Rect client_rect_{100, 100, 400, 300}; - String title_; + std::string title_; HWND hwnd_ = nullptr; WinNativeWindow* parent_window_ = nullptr; |