wxAtof independent of wxNEED_WX_STDLIB_H, used by Visual C++ in Unicode mode,
defined to atof in non-Unicode mode. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2120 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -104,7 +104,9 @@ typedef _TUCHAR wxUChar;
|
||||
#define wxVsprintf _vstprintf
|
||||
|
||||
// stdlib.h functions
|
||||
#define wxAtof(s) atof(wxString(s).mb_str())
|
||||
#if !wxUSE_UNICODE
|
||||
#define wxAtof atof
|
||||
#endif
|
||||
#define wxAtoi _ttoi
|
||||
#define wxAtol _ttol
|
||||
#define wxGetenv _tgetenv
|
||||
@@ -365,8 +367,11 @@ int WXDLLEXPORT wxSprintf(wxChar *buf, const wxChar *fmt, ...);
|
||||
int WXDLLEXPORT wxVsprintf(wxChar *buf, const wxChar *fmt, va_list argptr);
|
||||
#endif
|
||||
|
||||
#ifdef wxNEED_WX_STDLIB_H
|
||||
#ifndef wxAtof
|
||||
double WXDLLEXPORT wxAtof(const wxChar *psz);
|
||||
#endif
|
||||
|
||||
#ifdef wxNEED_WX_STDLIB_H
|
||||
int WXDLLEXPORT wxAtoi(const wxChar *psz);
|
||||
long WXDLLEXPORT wxAtol(const wxChar *psz);
|
||||
wxChar * WXDLLEXPORT wxGetenv(const wxChar *name);
|
||||
|
Reference in New Issue
Block a user