#if wxUSE_UNICODE instead of #if defined(wxUSE_UNICODE)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23379 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -196,7 +196,7 @@ const off_t wxInvalidOffset = (off_t)-1;
|
|||||||
// implementation
|
// implementation
|
||||||
// ============================================================================
|
// ============================================================================
|
||||||
|
|
||||||
#if defined(__WXMAC__) && !defined(__DARWIN__) && !defined(wxUSE_UNICODE)
|
#if defined(__WXMAC__) && !defined(__DARWIN__) && !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__) && !defined(wxUSE_UNICODE)
|
#if defined(__WXMAC__) && !defined(__DARWIN__) && !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 );
|
||||||
@@ -1305,7 +1305,7 @@ wxChar * WXDLLEXPORT wxGetenv(const wxChar *name)
|
|||||||
// printf( "home %s\n", val );
|
// printf( "home %s\n", val );
|
||||||
|
|
||||||
// convert it,
|
// convert it,
|
||||||
#ifdef wxUSE_UNICODE
|
#if wxUSE_UNICODE
|
||||||
data = (wxObject *)new wxString(val, wxConvLocal);
|
data = (wxObject *)new wxString(val, wxConvLocal);
|
||||||
#else
|
#else
|
||||||
data = (wxObject *)new wxString(val);
|
data = (wxObject *)new wxString(val);
|
||||||
|
Reference in New Issue
Block a user