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

try to fix D Mars compilation for Unicode

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25736 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Chris Elliott
2004-02-11 14:34:22 +00:00
parent 2a536376ec
commit 8dfb846e80
2 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/wx/wxchar.h
View File

@@ -303,13 +303,11 @@
#define wxPuts _putts #define wxPuts _putts
#define wxScanf _tscanf #define wxScanf _tscanf
#if defined(__DMC__) #if defined(__DMC__)
/* Digital Mars adds count to _stprintf (C99) so it does not fit wxWindows needs */
/* and there is a bug in D Mars tchar.h prior to 8.39.4n, so define as sprintf */
/* for non-unicode builds CE */
/* Unicode broken 10 Feb 04 Fixme */
#if wxUSE_UNICODE #if wxUSE_UNICODE
#define wxSprintf swprintf /* Digital Mars adds count to _stprintf (C99) so prototype conversion see wxchar.cpp */
int wxSprintf (wchar_t * __RESTRICT s, const wchar_t * __RESTRICT format, ... ) ;
#else #else
/* and there is a bug in D Mars tchar.h prior to 8.39.4n, so define as sprintf */
#define wxSprintf sprintf #define wxSprintf sprintf
#endif #endif
#else #else

17
src/common/wxchar.cpp
View File

@@ -540,6 +540,23 @@ int WXDLLEXPORT wxSnprintf_(wxChar *buf, size_t len, const wxChar *format, ...)
} }
#endif // wxSnprintf_ #endif // wxSnprintf_
#if defined(__DMC__)
/* Digital Mars adds count to _stprintf (C99) so convert */
#if wxUSE_UNICODE
int wxSprintf (wchar_t * __RESTRICT s, const wchar_t * __RESTRICT format, ... )
{
va_list arglist;
va_start( arglist, format );
int iLen = swprintf ( s, -1, format, arglist );
va_end( arglist );
return iLen ;
}
#endif // wxUSE_UNICODE
#endif //__DMC__
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// implement the standard IO functions for wide char if libc doesn't have them // implement the standard IO functions for wide char if libc doesn't have them
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------