diff options
author | Yuqian Yang <crupest@crupest.life> | 2025-10-17 21:50:24 +0800 |
---|---|---|
committer | Yuqian Yang <crupest@crupest.life> | 2025-10-17 21:50:24 +0800 |
commit | 728d592f4075ae78b67dab6911ada05875a470a3 (patch) | |
tree | 57a7232ea0a984b0344bc63a593c1dee65072d2f /include/cru/platform/gui | |
parent | 045462a6aed2796976a2f5cf0042f9a0ac1493f7 (diff) | |
download | cru-728d592f4075ae78b67dab6911ada05875a470a3.tar.gz cru-728d592f4075ae78b67dab6911ada05875a470a3.tar.bz2 cru-728d592f4075ae78b67dab6911ada05875a470a3.zip |
Fix macOS build.
Diffstat (limited to 'include/cru/platform/gui')
-rw-r--r-- | include/cru/platform/gui/osx/Clipboard.h | 4 | ||||
-rw-r--r-- | include/cru/platform/gui/osx/InputMethod.h | 2 | ||||
-rw-r--r-- | include/cru/platform/gui/osx/Menu.h | 4 | ||||
-rw-r--r-- | include/cru/platform/gui/osx/Resource.h | 4 | ||||
-rw-r--r-- | include/cru/platform/gui/osx/UiApplication.h | 4 | ||||
-rw-r--r-- | include/cru/platform/gui/osx/Window.h | 4 |
6 files changed, 11 insertions, 11 deletions
diff --git a/include/cru/platform/gui/osx/Clipboard.h b/include/cru/platform/gui/osx/Clipboard.h index b4dcce4c..6672f84d 100644 --- a/include/cru/platform/gui/osx/Clipboard.h +++ b/include/cru/platform/gui/osx/Clipboard.h @@ -22,8 +22,8 @@ class OsxClipboard : public OsxGuiResource, public virtual IClipboard { ~OsxClipboard() override; public: - String GetText() override; - void SetText(String text) override; + std::string GetText() override; + void SetText(std::string text) override; private: std::unique_ptr<details::OsxClipboardPrivate> p_; diff --git a/include/cru/platform/gui/osx/InputMethod.h b/include/cru/platform/gui/osx/InputMethod.h index cbfdae6c..067d86ea 100644 --- a/include/cru/platform/gui/osx/InputMethod.h +++ b/include/cru/platform/gui/osx/InputMethod.h @@ -46,7 +46,7 @@ class OsxInputMethodContext : public OsxGuiResource, IEvent<std::nullptr_t>* CompositionEvent() override; - IEvent<StringView>* TextEvent() override; + IEvent<std::string>* TextEvent() override; bool IsEnabled(); diff --git a/include/cru/platform/gui/osx/Menu.h b/include/cru/platform/gui/osx/Menu.h index c5cc756a..05f21e1c 100644 --- a/include/cru/platform/gui/osx/Menu.h +++ b/include/cru/platform/gui/osx/Menu.h @@ -25,8 +25,8 @@ class OsxMenuItem : public OsxGuiResource, public virtual IMenuItem { ~OsxMenuItem() override; public: - String GetTitle() override; - void SetTitle(String title) override; + std::string GetTitle() override; + void SetTitle(std::string title) override; bool IsEnabled() override; void SetEnabled(bool enabled) override; IMenu* GetParentMenu() override; diff --git a/include/cru/platform/gui/osx/Resource.h b/include/cru/platform/gui/osx/Resource.h index 1eec7d09..1253544c 100644 --- a/include/cru/platform/gui/osx/Resource.h +++ b/include/cru/platform/gui/osx/Resource.h @@ -1,7 +1,7 @@ #pragma once #include "cru/platform/osx/Resource.h" -#include "cru/platform/gui/Base.h" +#include <cru/platform/gui/UiApplication.h> namespace cru::platform::gui::osx { class OsxGuiResource : public platform::osx::OsxResource { @@ -14,7 +14,7 @@ class OsxGuiResource : public platform::osx::OsxResource { ~OsxGuiResource() override = default; public: - String GetPlatformId() const override { return u"OSX GUI"; } + std::string GetPlatformId() const override { return "OSX GUI"; } IUiApplication* GetUiApplication() const { return ui_application_; } diff --git a/include/cru/platform/gui/osx/UiApplication.h b/include/cru/platform/gui/osx/UiApplication.h index 2d2c119c..f0e311dc 100644 --- a/include/cru/platform/gui/osx/UiApplication.h +++ b/include/cru/platform/gui/osx/UiApplication.h @@ -51,9 +51,9 @@ class OsxUiApplication : public OsxGuiResource, public virtual IUiApplication { IMenu* GetApplicationMenu() override; - std::optional<String> ShowSaveDialog(SaveDialogOptions options) override; + std::optional<std::string> ShowSaveDialog(SaveDialogOptions options) override; - std::optional<std::vector<String>> ShowOpenDialog( + std::optional<std::vector<std::string>> ShowOpenDialog( OpenDialogOptions options) override; private: diff --git a/include/cru/platform/gui/osx/Window.h b/include/cru/platform/gui/osx/Window.h index 6cefbe8e..d00136b0 100644 --- a/include/cru/platform/gui/osx/Window.h +++ b/include/cru/platform/gui/osx/Window.h @@ -36,8 +36,8 @@ class OsxWindow : public OsxGuiResource, public INativeWindow { WindowStyleFlag GetStyleFlag() override; 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; void SetVisibility(WindowVisibilityType visibility) override; |