From d868d7b0d463ede80b761f87f10d4e25f52989c3 Mon Sep 17 00:00:00 2001 From: Yuqian Yang Date: Sun, 15 Jun 2025 01:02:30 +0800 Subject: Remove some files of OSX. Symbol Point is conflict and needs to be fixed. --- src/platform/gui/osx/Menu.mm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/platform/gui/osx/Menu.mm') 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 namespace cru::platform::gui::osx { -using platform::osx::Convert; - namespace { std::unique_ptr 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]; } -- cgit v1.2.3