From 80fd70e8f19942a600f66afce303e750b338c430 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Tue, 7 Apr 2020 12:04:01 +0200 Subject: [PATCH] make NSString conversions available for all osx platforms --- include/wx/osx/cocoa/private.h | 5 ----- include/wx/osx/core/private.h | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/wx/osx/cocoa/private.h b/include/wx/osx/cocoa/private.h index 9a98f67252..2080e475cf 100644 --- a/include/wx/osx/cocoa/private.h +++ b/include/wx/osx/cocoa/private.h @@ -518,11 +518,6 @@ extern ClassicCursor gMacCursors[]; extern NSLayoutManager* gNSLayoutManager; -// NSString<->wxString - -wxString wxStringWithNSString(NSString *nsstring); -NSString* wxNSStringWithWxString(const wxString &wxstring); - // helper class for setting the current appearance to the // effective appearance and restore when exiting scope diff --git a/include/wx/osx/core/private.h b/include/wx/osx/core/private.h index 6f5a05bd23..ba57b86157 100644 --- a/include/wx/osx/core/private.h +++ b/include/wx/osx/core/private.h @@ -59,6 +59,11 @@ WXDLLIMPEXP_BASE long wxMacTranslateKey(unsigned char key, unsigned char code); #endif +// NSString<->wxString + +WXDLLIMPEXP_BASE wxString wxStringWithNSString(NSString *nsstring); +WXDLLIMPEXP_BASE NSString* wxNSStringWithWxString(const wxString &wxstring); + WXDLLIMPEXP_BASE CFURLRef wxOSXCreateURLFromFileSystemPath( const wxString& path); #if wxUSE_GUI