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

Implemented the various printf() functions under

Browse Source 
Unicode with their GNU libc 2.2 funtions. This
    saves us some unicode<->ansi conversion and we
    no longer need the experimental printf() code
    in string.cpp. I had to implement wxSprintf()
    using wxSnprintf() as the former doesn't exist
    in Unicode GNU libc 2.2.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16442 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2002-08-10 11:58:15 +00:00
parent e6ccaf1a99
commit a59c124d06
4 changed files with 84 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
include/wx/wxchar.h
View File

@@ -372,6 +372,29 @@ typedef unsigned __WCHAR_TYPE__ wxUChar;
# define wxStrtoul wcstoul
# define wxStrxfrm wcsxfrm
# define wxFgetc fgetwc
# define wxFgetchar fgetwchar
# define wxFgets fgetws
# define wxFputc fputwc
# define wxFputchar fputwchar
# define wxFprintf fwprintf
# define wxFscanf fwscanf
# define wxGetc getwc
# define wxGetchar getwchar
# define wxGets getws
# define wxPrintf wprintf
# define wxPutc wputc
# define wxPutchar wputchar
# define wxPuts putws
# define wxScanf wscanf
# define wxSnprintf swprintf
# define wxSscanf swscanf
# define wxUngetc ungetwc
# define wxVfprint vfwprintf
# define wxVprintf vwprintf
# define wxVsscanf vswscanf
# define wxVsnprintf vswprintf
// glibc doesn't have wc equivalents of the other stuff
# define wxNEED_WX_STDIO_H
# define wxNEED_WX_STDLIB_H
@@ -482,29 +505,30 @@ typedef unsigned __WCHAR_TYPE__ wxUChar;
# endif
# ifdef wxNEED_WX_STDIO_H
# define wxFopen fopen
# define wxFreopen freopen
# define wxPerror perror
# define wxRemove remove
# define wxRename rename
# define wxTmpnam tmpnam
# define wxFgetc fgetc
# define wxFgetchar fgetchar
# define wxFgets fgets
# define wxFopen fopen
# define wxFputc fputc
# define wxFputchar fputchar
# define wxFprintf fprintf
# define wxFreopen freopen
# define wxFscanf fscanf
# define wxGetc getc
# define wxGetchar getchar
# define wxGets gets
# define wxPerror perror
# define wxPrintf printf
# define wxPutc putc
# define wxPutchar putchar
# define wxPuts puts
# define wxRemove remove
# define wxRename rename
# define wxScanf scanf
# define wxSprintf sprintf
# define wxSscanf sscanf
# define wxTmpnam tmpnam
# define wxUngetc ungetc
# define wxVfprint vfprintf
# define wxVprintf vprintf
@@ -513,6 +537,7 @@ typedef unsigned __WCHAR_TYPE__ wxUChar;
# undef wxNEED_WX_STDIO_H
# endif
# ifdef wxNEED_WX_STDLIB_H
# define wxAtof atof
# define wxAtoi atoi
@@ -640,14 +665,6 @@ WXDLLEXPORT FILE * wxFopen(const wxChar *path, const wxChar *mode);
WXDLLEXPORT FILE * wxFreopen(const wxChar *path, const wxChar *mode, FILE *stream);
WXDLLEXPORT int wxRemove(const wxChar *path);
WXDLLEXPORT int wxRename(const wxChar *oldpath, const wxChar *newpath);
WXDLLEXPORT int wxPrintf(const wxChar *fmt, ...) ATTRIBUTE_PRINTF_1;
WXDLLEXPORT int wxVprintf(const wxChar *fmt, va_list argptr);
WXDLLEXPORT int wxFprintf(FILE *stream, const wxChar *fmt, ...) ATTRIBUTE_PRINTF_2;
WXDLLEXPORT int wxVfprintf(FILE *stream, const wxChar *fmt, va_list argptr);
WXDLLEXPORT int wxSprintf(wxChar *buf, const wxChar *fmt, ...) ATTRIBUTE_PRINTF_2;
WXDLLEXPORT int wxVsprintf(wxChar *buf, const wxChar *fmt, va_list argptr);
WXDLLEXPORT int wxSscanf(const wxChar *buf, const wxChar *fmt, ...) ATTRIBUTE_PRINTF_2;
WXDLLEXPORT int wxVsscanf(const wxChar *buf, const wxChar *fmt, va_list argptr);
#endif
#ifndef wxAtof