use newly added GetViewRect() instead of trying to guess the list ctrl size ourselves

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

diff --git a/include/wx/wxchar.h b/include/wx/wxchar.h
index 9a30e286fae62db60165731fb6e01e19050d8bf0..27148c595d09d98cdd1ee2d40b4411e92f588508 100644 (file)
--- a/include/wx/wxchar.h
+++ b/include/wx/wxchar.h
@@ -12,7 +12,7 @@
 #ifndef _WX_WXCHAR_H_
 #define _WX_WXCHAR_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma interface "wxchar.h"
 #endif
 
@@ -508,7 +508,7 @@
             // time.h functions
             #define  wxAsctime   wasciitime
             #define  wxCtime     wctime
-            #define  wxStrftime  wcsftime
+            // #define  wxStrftime  wcsftime
 
             /*
             #define wxNEED_FPUTWC
@@ -527,8 +527,8 @@
             // use our own versions
             #define wxNEED_WX_STDIO_H
             #define wxNEED_WX_STDLIB_H
-            #define wxNEED_WX_TIME_H
             */
+            #define wxNEED_WX_TIME_H
         #else // !metrowerks for apple
             #error  "Please define wide character functions for your environment"
         #endif
@@ -580,7 +580,7 @@
         #define  wxStrxfrm   strxfrm
 
         // stdio.h functions
-        #if defined(__WXMAC__) && !defined(__DARWIN__)
+        #if defined(__WXMAC__) && !defined(__DARWIN__)  && !wxUSE_UNICODE
         #include <stdio.h>
         WXDLLIMPEXP_BASE FILE *   wxFopen(const wxChar *path, const wxChar *mode);
         WXDLLIMPEXP_BASE FILE *   wxFreopen(const wxChar *path, const wxChar *mode, FILE *stream);
@@ -931,9 +931,12 @@ WXDLLIMPEXP_BASE int      wxSystem(const wxChar *psz);
 #ifdef __WXWINCE__
 WXDLLIMPEXP_BASE char* strdup(const char* s);
 WXDLLIMPEXP_BASE void *calloc( size_t num, size_t size );
+
+#if _WIN32_WCE <= 211
 WXDLLIMPEXP_BASE int isspace(int c);
 WXDLLIMPEXP_BASE int isascii( int c );
 #endif
+#endif
 
 // ----------------------------------------------------------------------------
 // multibyte to wide char conversion functions and macros