diff options
| author | Yuqian Yang <crupest@crupest.life> | 2025-06-15 01:02:30 +0800 |
|---|---|---|
| committer | Yuqian Yang <crupest@crupest.life> | 2025-06-15 01:02:30 +0800 |
| commit | d868d7b0d463ede80b761f87f10d4e25f52989c3 (patch) | |
| tree | eb61e339f15b6b8b4cc1a246b4281631e701d6e0 /src/platform/gui/osx/Menu.mm | |
| parent | 7ac84c9d200d43f50155ce1e8316ada12043f7a8 (diff) | |
| download | cru-d868d7b0d463ede80b761f87f10d4e25f52989c3.tar.gz cru-d868d7b0d463ede80b761f87f10d4e25f52989c3.tar.bz2 cru-d868d7b0d463ede80b761f87f10d4e25f52989c3.zip | |
Remove some files of OSX. Symbol Point is conflict and needs to be
fixed.
Diffstat (limited to 'src/platform/gui/osx/Menu.mm')
| -rw-r--r-- | src/platform/gui/osx/Menu.mm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/platform/gui/osx/Menu.mm b/src/platform/gui/osx/Menu.mm index e74ec23b..848af022 100644 --- a/src/platform/gui/osx/Menu.mm +++ b/src/platform/gui/osx/Menu.mm @@ -1,14 +1,11 @@ #include "cru/platform/gui/osx/Menu.h" -#import "MenuPrivate.h" +#import "MenuPrivate.h" #include "KeyboardPrivate.h" -#include "cru/base/platform/osx/Convert.h" #import <AppKit/NSApplication.h> namespace cru::platform::gui::osx { -using platform::osx::Convert; - namespace { std::unique_ptr<OsxMenu> application_menu = nullptr; } @@ -62,9 +59,12 @@ OsxMenuItem::OsxMenuItem(IUiApplication* ui_application) : OsxGuiResource(ui_app OsxMenuItem::~OsxMenuItem() { delete p_; } -String OsxMenuItem::GetTitle() { return Convert((CFStringRef)[p_->menu_item_ title]); } +String OsxMenuItem::GetTitle() { return ::cru::String::FromCFStringRef((CFStringRef)[p_->menu_item_ title]); } -void OsxMenuItem::SetTitle(String title) { [p_->menu_item_ setTitle:(NSString*)Convert(title)]; } +void OsxMenuItem::SetTitle(String title) { + auto cf_title = title.ToCFStringRef(); + [p_->menu_item_ setTitle:(NSString*)(cf_title.ref)]; +} bool OsxMenuItem::IsEnabled() { return [p_->menu_item_ isEnabled]; } |