unicode wxMac CW fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22964 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -331,9 +331,9 @@ void *wxDynamicLibrary::GetSymbol(const wxString &name, bool *success) const
|
|||||||
CFragSymbolClass symClass;
|
CFragSymbolClass symClass;
|
||||||
Str255 symName;
|
Str255 symName;
|
||||||
#if TARGET_CARBON
|
#if TARGET_CARBON
|
||||||
c2pstrcpy( (StringPtr) symName, name );
|
c2pstrcpy( (StringPtr) symName, name.fn_str() );
|
||||||
#else
|
#else
|
||||||
strcpy( (char *)symName, name );
|
strcpy( (char *)symName, name.fn_str() );
|
||||||
c2pstr( (char *)symName );
|
c2pstr( (char *)symName );
|
||||||
#endif
|
#endif
|
||||||
if( FindSymbol( m_handle, symName, &symAddress, &symClass ) == noErr )
|
if( FindSymbol( m_handle, symName, &symAddress, &symClass ) == noErr )
|
||||||
|
@@ -196,7 +196,7 @@ const off_t wxInvalidOffset = (off_t)-1;
|
|||||||
// implementation
|
// implementation
|
||||||
// ============================================================================
|
// ============================================================================
|
||||||
|
|
||||||
#if defined(__WXMAC__) && !defined(__DARWIN__)
|
#if defined(__WXMAC__) && !defined(__DARWIN__) && !defined(wxUSE_UNICODE)
|
||||||
|
|
||||||
WXDLLEXPORT int wxStat( const wxChar *file_name, wxStructStat *buf )
|
WXDLLEXPORT int wxStat( const wxChar *file_name, wxStructStat *buf )
|
||||||
{
|
{
|
||||||
|
@@ -1205,7 +1205,7 @@ WXDLLEXPORT long int wxStrtol(const wxChar *nptr, wxChar **endptr, int base)
|
|||||||
}
|
}
|
||||||
#endif // wxNEED_WX_STRING_H
|
#endif // wxNEED_WX_STRING_H
|
||||||
|
|
||||||
#if defined(__WXMAC__) && !defined(__DARWIN__)
|
#if defined(__WXMAC__) && !defined(__DARWIN__) && !defined(wxUSE_UNICODE)
|
||||||
WXDLLEXPORT FILE * wxFopen(const wxChar *path, const wxChar *mode)
|
WXDLLEXPORT FILE * wxFopen(const wxChar *path, const wxChar *mode)
|
||||||
{
|
{
|
||||||
return fopen( wxMacStringToCString(path), mode );
|
return fopen( wxMacStringToCString(path), mode );
|
||||||
|
Reference in New Issue
Block a user