Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

making NSString conversion functions available in private.h

Browse Source
This commit is contained in:
Stefan Csomor
2018-02-28 21:08:27 +01:00
parent 5e61527c04
commit 0fc53016a9
3 changed files with 27 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/wx/osx/cocoa/private.h
View File

@@ -500,6 +500,11 @@ extern ClassicCursor gMacCursors[];
extern NSLayoutManager* gNSLayoutManager; extern NSLayoutManager* gNSLayoutManager;
// NSString<->wxString
wxString wxStringWithNSString(NSString *nsstring);
NSString* wxNSStringWithWxString(const wxString &wxstring);
#endif // wxUSE_GUI #endif // wxUSE_GUI
#endif #endif

24
src/html/htmlctrl/webkit/webkit.mm
View File

@@ -93,30 +93,6 @@ wxWebKitNewWindowEvent::wxWebKitNewWindowEvent( wxWindow* win )
} }
} }
//---------------------------------------------------------
// helper functions for NSString<->wxString conversion
//---------------------------------------------------------
inline wxString wxStringWithNSString(NSString *nsstring)
{
#if wxUSE_UNICODE
return wxString([nsstring UTF8String], wxConvUTF8);
#else
return wxString([nsstring lossyCString]);
#endif // wxUSE_UNICODE
}
inline NSString* wxNSStringWithWxString(const wxString &wxstring)
{
#if wxUSE_UNICODE
return [NSString stringWithUTF8String: wxstring.mb_str(wxConvUTF8)];
#else
return [NSString stringWithCString: wxstring.c_str() length:wxstring.Len()];
#endif // wxUSE_UNICODE
}
inline int wxNavTypeFromWebNavType(int type){ inline int wxNavTypeFromWebNavType(int type){
if (type == WebNavigationTypeLinkClicked) if (type == WebNavigationTypeLinkClicked)
return wxWEBKIT_NAV_LINK_CLICKED; return wxWEBKIT_NAV_LINK_CLICKED;

22
src/osx/carbon/utilscocoa.mm
View File

@@ -562,5 +562,27 @@ void wxMacCocoaShowCursor()
[NSCursor unhide]; [NSCursor unhide];
} }
//---------------------------------------------------------
// helper functions for NSString<->wxString conversion
//---------------------------------------------------------
wxString wxStringWithNSString(NSString *nsstring)
{
#if wxUSE_UNICODE
return wxString([nsstring UTF8String], wxConvUTF8);
#else
return wxString([nsstring lossyCString]);
#endif // wxUSE_UNICODE
}
NSString* wxNSStringWithWxString(const wxString &wxstring)
{
#if wxUSE_UNICODE
return [NSString stringWithUTF8String: wxstring.mb_str(wxConvUTF8)];
#else
return [NSString stringWithCString: wxstring.c_str() length:wxstring.Len()];
#endif // wxUSE_UNICODE
}
#endif #endif