X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9a6d14383a57771a334f6d0b6376dd47bf24049d..795dac4c866d89804e625fa1d04cb70aba320183:/src/common/wxcrt.cpp

diff --git a/src/common/wxcrt.cpp b/src/common/wxcrt.cpp
index 5a114a368d..05909433d2 100644
--- a/src/common/wxcrt.cpp
+++ b/src/common/wxcrt.cpp
@@ -65,9 +65,9 @@ using namespace std ;
 #endif
 
 #if defined(__DARWIN__)
-	#include "wx/osx/core/cfref.h"
-	#include <CoreFoundation/CFLocale.h>
-	#include "wx/osx/core/cfstring.h"
+    #include "wx/osx/core/cfref.h"
+    #include <CoreFoundation/CFLocale.h>
+    #include "wx/osx/core/cfstring.h"
     #include <xlocale.h>
 #endif
 
@@ -99,9 +99,9 @@ WXDLLIMPEXP_BASE size_t wxMB2WC(wchar_t *buf, const char *psz, size_t n)
   // support it (the only currently known example being Metrowerks, see
   // wx/crt.h) we don't use its mbstowcs() at all
 #ifdef HAVE_WCSRTOMBS
-  return mbsrtowcs((wchar_t *) NULL, &psz, 0, &mbstate);
+  return mbsrtowcs(NULL, &psz, 0, &mbstate);
 #else
-  return wxMbstowcs((wchar_t *) NULL, psz, 0);
+  return wxMbstowcs(NULL, psz, 0);
 #endif
 }
 
@@ -126,9 +126,9 @@ WXDLLIMPEXP_BASE size_t wxWC2MB(char *buf, const wchar_t *pwz, size_t n)
   }
 
 #ifdef HAVE_WCSRTOMBS
-  return wcsrtombs((char *) NULL, &pwz, 0, &mbstate);
+  return wcsrtombs(NULL, &pwz, 0, &mbstate);
 #else
-  return wxWcstombs((char *) NULL, pwz, 0);
+  return wxWcstombs(NULL, pwz, 0);
 #endif
 }
 #endif // wxUSE_WCHAR_T
@@ -255,14 +255,14 @@ int /* not wint_t */ wxCRT_FputcW(wchar_t wc, FILE *stream)
 // TODO: implement the scanf() functions
 static int vwscanf(const wchar_t *format, va_list argptr)
 {
-    wxFAIL_MSG( _T("TODO") );
+    wxFAIL_MSG( wxT("TODO") );
 
     return -1;
 }
 
 static int vfwscanf(FILE *stream, const wchar_t *format, va_list argptr)
 {
-    wxFAIL_MSG( _T("TODO") );
+    wxFAIL_MSG( wxT("TODO") );
 
     return -1;
 }
@@ -299,12 +299,12 @@ static int vswscanf(const wchar_t *ws, const wchar_t *format, va_list argptr)
     // of the function. This doesn't work with %c and %s because of difference
     // in size of char and wchar_t, though.
 
-    wxCHECK_MSG( wxStrstr(format, _T("%s")) == NULL, -1,
-                 _T("incomplete vswscanf implementation doesn't allow %s") );
-    wxCHECK_MSG( wxStrstr(format, _T("%c")) == NULL, -1,
-                 _T("incomplete vswscanf implementation doesn't allow %c") );
+    wxCHECK_MSG( wxStrstr(format, wxT("%s")) == NULL, -1,
+                 wxT("incomplete vswscanf implementation doesn't allow %s") );
+    wxCHECK_MSG( wxStrstr(format, wxT("%c")) == NULL, -1,
+                 wxT("incomplete vswscanf implementation doesn't allow %c") );
 
-    return vsscanf(wx_static_cast(const char*, wxConvLibc.cWX2MB(ws)),
+    return vsscanf(static_cast<const char*>(wxConvLibc.cWX2MB(ws)),
         wxConvLibc.cWX2MB(format), argptr);
 }
 #endif
@@ -643,13 +643,13 @@ int wxVsprintf(wchar_t *str, const wxString& format, va_list argptr)
 #if wxUSE_UNICODE_WCHAR
 #ifdef __DMC__
 /*
-This fails with a bug similar to 
+This fails with a bug similar to
 http://www.digitalmars.com/pnews/read.php?server=news.digitalmars.com&group=c++.beta&artnum=680
 in DMC 8.49 and 8.50
 I don't see it being used in the wxWidgets sources at present (oct 2007) CE
 */
 #pragma message ( "warning ::::: wxVsprintf(wchar_t *str, const wxString& format, va_list argptr) not yet implemented" )
-    wxFAIL_MSG( _T("TODO") );
+    wxFAIL_MSG( wxT("TODO") );
 
     return -1;
 #else
@@ -797,17 +797,17 @@ WXDLLIMPEXP_BASE wchar_t * wxCRT_StrdupW(const wchar_t *pwz)
 #endif // wxCRT_StrdupW
 
 #ifndef wxWCHAR_T_IS_WXCHAR16
-WXDLLIMPEXP_BASE size_t wxStrlen(const wxChar16 *s ) 
-{ 
-    if (!s) return 0; 
-    size_t i=0; 
-    while (*s!=0) { ++i; ++s; }; 
+size_t wxStrlen(const wxChar16 *s )
+{
+    if (!s) return 0;
+    size_t i=0;
+    while (*s!=0) { ++i; ++s; };
     return i;
 }
 
-WXDLLIMPEXP_BASE wxChar16* wxStrdup(const wxChar16* s)
-{ 
-  size_t size = (wxStrlen(s) + 1) * sizeof(wxChar16); 
+wxChar16* wxStrdup(const wxChar16* s)
+{
+  size_t size = (wxStrlen(s) + 1) * sizeof(wxChar16);
   wxChar16 *ret = (wxChar16*) malloc(size);
   memcpy(ret, s, size);
   return ret;
@@ -815,17 +815,17 @@ WXDLLIMPEXP_BASE wxChar16* wxStrdup(const wxChar16* s)
 #endif
 
 #ifndef wxWCHAR_T_IS_WXCHAR32
-WXDLLIMPEXP_BASE size_t wxStrlen(const wxChar32 *s ) 
-{ 
-    if (!s) return 0; 
-    size_t i=0; 
-    while (*s!=0) { ++i; ++s; }; 
+size_t wxStrlen(const wxChar32 *s )
+{
+    if (!s) return 0;
+    size_t i=0;
+    while (*s!=0) { ++i; ++s; };
     return i;
 }
 
-WXDLLIMPEXP_BASE wxChar32* wxStrdup(const wxChar32* s)
-{ 
-  size_t size = (wxStrlen(s) + 1) * sizeof(wxChar32); 
+wxChar32* wxStrdup(const wxChar32* s)
+{
+  size_t size = (wxStrlen(s) + 1) * sizeof(wxChar32);
   wxChar32 *ret = (wxChar32*) malloc(size);
   memcpy(ret, s, size);
   return ret;
@@ -911,7 +911,7 @@ WXDLLIMPEXP_BASE wchar_t* wxCRT_GetenvW(const wchar_t *name)
     // NB: buffer returned by getenv() is allowed to be overwritten next
     //     time getenv() is called, so it is OK to use static string
     //     buffer to hold the data.
-    static wxWCharBuffer value((wchar_t*)NULL);
+    static wxWCharBuffer value;
     value = wxConvLibc.cMB2WC(getenv(wxConvLibc.cWC2MB(name)));
     return value.data();
 }
@@ -1115,15 +1115,15 @@ static T *wxCRT_DoStrtok(T *psz, const T *delim, T **save_ptr)
     psz += wxStrspn(psz, delim);
     if (!*psz)
     {
-        *save_ptr = (T *)NULL;
-        return (T *)NULL;
+        *save_ptr = NULL;
+        return NULL;
     }
 
     T *ret = psz;
     psz = wxStrpbrk(psz, delim);
     if (!psz)
     {
-        *save_ptr = (T*)NULL;
+        *save_ptr = NULL;
     }
     else
     {
@@ -1222,7 +1222,7 @@ void wxUpdateLocaleIsUtf8()
 #if wxUSE_UTF8_LOCALE_ONLY
     if ( !wxIsLocaleUtf8() )
     {
-        wxLogFatalError(_T("This program requires UTF-8 locale to run."));
+        wxLogFatalError(wxT("This program requires UTF-8 locale to run."));
     }
 #else // !wxUSE_UTF8_LOCALE_ONLY
     wxLocaleIsUtf8 = wxIsLocaleUtf8();
@@ -1311,15 +1311,15 @@ int wxVsscanf(const char *str, const char *format, va_list ap)
 int wxVsscanf(const wchar_t *str, const wchar_t *format, va_list ap)
     { return wxCRT_VsscanfW(str, format, ap); }
 int wxVsscanf(const wxCharBuffer& str, const char *format, va_list ap)
-    { return wxCRT_VsscanfA(wx_static_cast(const char*, str), format, ap); }
+    { return wxCRT_VsscanfA(static_cast<const char*>(str), format, ap); }
 int wxVsscanf(const wxWCharBuffer& str, const wchar_t *format, va_list ap)
     { return wxCRT_VsscanfW(str, format, ap); }
 int wxVsscanf(const wxString& str, const char *format, va_list ap)
-    { return wxCRT_VsscanfA(wx_static_cast(const char*, str.mb_str()), format, ap); }
+    { return wxCRT_VsscanfA(static_cast<const char*>(str.mb_str()), format, ap); }
 int wxVsscanf(const wxString& str, const wchar_t *format, va_list ap)
     { return wxCRT_VsscanfW(str.wc_str(), format, ap); }
 int wxVsscanf(const wxCStrData& str, const char *format, va_list ap)
-    { return wxCRT_VsscanfA(wx_static_cast(const char*, str.AsCharBuf()), format, ap); }
+    { return wxCRT_VsscanfA(static_cast<const char*>(str.AsCharBuf()), format, ap); }
 int wxVsscanf(const wxCStrData& str, const wchar_t *format, va_list ap)
     { return wxCRT_VsscanfW(str.AsWCharBuf(), format, ap); }
 #endif // HAVE_NO_VSSCANF