From 1940f6691489b99b9a0e939f907351fed2c8f99d Mon Sep 17 00:00:00 2001
From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Sat, 29 Mar 2003 15:44:56 +0000
Subject: [PATCH] switching to as many MSL wchar implementations as possible
 for wxMac unicode

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19869 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/wxchar.h | 30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/include/wx/wxchar.h b/include/wx/wxchar.h
index 8245dc380c..1c3eedbc5d 100644
--- a/include/wx/wxchar.h
+++ b/include/wx/wxchar.h
@@ -147,6 +147,10 @@
     #define wxHAVE_TCHAR_SUPPORT
 #endif // compilers with (good) TCHAR support
 
+#ifdef __MWERKS__
+    #define HAVE_WPRINTF
+#endif
+
 #ifdef wxHAVE_TCHAR_SUPPORT
     // get TCHAR definition if we've got it
     #include <tchar.h>
@@ -434,7 +438,7 @@
             #define wxNEED_WX_STDIO_H
             #define wxNEED_WX_STDLIB_H
             #define wxNEED_WX_TIME_H
-        #elif defined(__MWERKS__) && defined(macintosh)
+        #elif defined(__MWERKS__) && ( defined(macintosh) || defined(__MACH__) )
             // ctype.h functions (wctype.h)
             #define  wxIsalnum   iswalnum
             #define  wxIsalpha   iswalpha
@@ -480,6 +484,29 @@
             #define  wxGets      getws
             #define  wxUngetc    ungetwc
 
+            #define wxNEED_PRINTF_CONVERSION
+
+            #define  wxPutc      putwc
+            #define  wxPutchar   putwchar
+            #define  wxFputs     fputws
+            
+            // stdio.h functions
+            
+             #define wxNEED_WX_STDIO_H
+
+            // stdlib.h functions
+            #define  wxAtof      watof
+            #define  wxAtoi      watoi
+            #define  wxAtol      watol
+            #define  wxGetenv(a)    ((wxChar*)NULL)
+            #define  wxSystem(a)    ((int)NULL)
+
+            // time.h functions
+            #define  wxAsctime   wasciitime
+            #define  wxCtime     wctime
+            #define  wxStrftime  wcsftime
+
+            /*
             #define wxNEED_FPUTWC
 
             #include <stdio.h>
@@ -497,6 +524,7 @@
             #define wxNEED_WX_STDIO_H
             #define wxNEED_WX_STDLIB_H
             #define wxNEED_WX_TIME_H
+            */
         #else // !metrowerks for apple
             #error  "Please define wide character functions for your environment"
         #endif