move code from .h to .cpp to prevent Borland warning

[wxWidgets.git] / include / wx / wxchar.h

diff --git a/include/wx/wxchar.h b/include/wx/wxchar.h
index 4383bd7b8be7f04364b5aec0a7566e19ec986bc0..d120ab33d831c9a582c8b155eac99fe0772c6d60 100644 (file)
--- a/include/wx/wxchar.h
+++ b/include/wx/wxchar.h
@@ -12,7 +12,7 @@
 #ifndef _WX_WXCHAR_H_
 #define _WX_WXCHAR_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "wxchar.h"
 #endif
 
@@ -396,6 +396,8 @@
                 #define  wxPuts      putws
                 #define  wxFputs     fputws
             #else
+                #define wxNEED_FPUTWC
+
                 #include <stdio.h>
 
                 int wxFputs(const wxChar *ch, FILE *stream);
@@ -583,7 +585,9 @@ WXDLLEXPORT bool wxOKlibc(); // for internal use
             #define wxVsnprintf_    vswprintf
         #endif
     #else // ASCII
-        #if (defined(HAVE_VSNPRINTF) || defined(__WXMAC__))
+        // all versions of CodeWarrior supported by wxWindows apparently have
+        // vsnprintf()
+        #if defined(HAVE_VSNPRINTF) || defined(__MWERKS__)
             // assume we have snprintf() too if we have vsnprintf()
             #define wxVsnprintf_    vsnprintf
             #define wxSnprintf_     snprintf
@@ -643,18 +647,18 @@ WXDLLEXPORT bool wxOKlibc(); // for internal use
     int wxVfprintf( FILE *stream, const wxChar *format, va_list ap );
     int wxVprintf( const wxChar *format, va_list ap );
     int wxVsprintf( wxChar *str, const wxChar *format, va_list ap );
-
-    // these 2 can be simply mapped to the versions with underscore at the end
-    // if we don't have to do the conversion
-    #ifdef wxNEED_PRINTF_CONVERSION
-        int wxSnprintf( wxChar *str, size_t size, const wxChar *format, ... ) ATTRIBUTE_PRINTF_4;
-        int wxVsnprintf( wxChar *str, size_t size, const wxChar *format, va_list ap );
-    #else
-        #define wxSnprintf wxSnprintf_
-        #define wxVsnprintf wxVsnprintf_
-    #endif
 #endif // wxNEED_PRINTF_CONVERSION
 
+// these 2 can be simply mapped to the versions with underscore at the end
+// if we don't have to do the conversion
+#ifdef wxNEED_PRINTF_CONVERSION
+    int wxSnprintf( wxChar *str, size_t size, const wxChar *format, ... ) ATTRIBUTE_PRINTF_4;
+    int wxVsnprintf( wxChar *str, size_t size, const wxChar *format, va_list ap );
+#else
+    #define wxSnprintf wxSnprintf_
+    #define wxVsnprintf wxVsnprintf_
+#endif
+
 // ----------------------------------------------------------------------------
 // various functions which might not be available in libc and for which we
 // provide our own replacements in wxchar.cpp