#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

diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp
index 80c870d8b8094adaf0b2b48edc73fa954b16cc70..d26964413aac9dfde38b6c9ab2eaf3a06f868d9c 100644 (file)
--- a/src/common/filefn.cpp
+++ b/src/common/filefn.cpp
@@ -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 )
 {

diff --git a/src/common/wxchar.cpp b/src/common/wxchar.cpp
index d8772fce24a26304167775661e0c82f7f72c6f49..230a9338ac7f2e9e2ebfaedee1178a8ce2759678 100644 (file)
--- a/src/common/wxchar.cpp
+++ b/src/common/wxchar.cpp
@@ -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)
 {
     return fopen( wxMacStringToCString(path), mode );
 WXDLLEXPORT FILE * wxFopen(const wxChar *path, const wxChar *mode)
 {
     return fopen( wxMacStringToCString(path), mode );


@@ -1305,7 +1305,7 @@ wxChar * WXDLLEXPORT wxGetenv(const wxChar *name)
     // printf( "home %s\n", val );
 
     // convert it,
     // printf( "home %s\n", val );
 
     // convert it,

-#ifdef wxUSE_UNICODE
+#if wxUSE_UNICODE

     data = (wxObject *)new wxString(val, wxConvLocal);
 #else
     data = (wxObject *)new wxString(val);
     data = (wxObject *)new wxString(val, wxConvLocal);
 #else
     data = (wxObject *)new wxString(val);