X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1e96e5030cd899ac43e9f6e7e9302d25644a05e9..98cb8dcb0cf3b0e660f1f67e1c02451ab10257de:/src/common/wxchar.cpp

diff --git a/src/common/wxchar.cpp b/src/common/wxchar.cpp
index 9d07b1c3fe..65024d40d8 100644
--- a/src/common/wxchar.cpp
+++ b/src/common/wxchar.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wxchar.cpp
+// Name:        src/common/wxchar.cpp
 // Purpose:     wxChar implementation
 // Author:      Ove Kåven
 // Modified by: Ron Lee
@@ -9,10 +9,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-  #pragma implementation "wxchar.h"
-#endif
-
 // ===========================================================================
 // headers, declarations, constants
 // ===========================================================================
@@ -65,7 +61,7 @@ using namespace std ;
 size_t WXDLLEXPORT wxMB2WC(wchar_t *buf, const char *psz, size_t n)
 {
   // assume that we have mbsrtowcs() too if we have wcsrtombs()
-#if HAVE_WCSRTOMBS
+#ifdef HAVE_WCSRTOMBS
   mbstate_t mbstate;
   memset(&mbstate, 0, sizeof(mbstate_t));
 #endif
@@ -91,7 +87,7 @@ size_t WXDLLEXPORT wxMB2WC(wchar_t *buf, const char *psz, size_t n)
 
 size_t WXDLLEXPORT wxWC2MB(char *buf, const wchar_t *pwz, size_t n)
 {
-#if HAVE_WCSRTOMBS
+#ifdef HAVE_WCSRTOMBS
   mbstate_t mbstate;
   memset(&mbstate, 0, sizeof(mbstate_t));
 #endif
@@ -102,14 +98,14 @@ size_t WXDLLEXPORT wxWC2MB(char *buf, const wchar_t *pwz, size_t n)
       if (n) *buf = '\0';
       return 0;
     }
-#if HAVE_WCSRTOMBS
+#ifdef HAVE_WCSRTOMBS
     return wcsrtombs(buf, &pwz, n, &mbstate);
 #else
     return wxWcstombs(buf, pwz, n);
 #endif
   }
 
-#if HAVE_WCSRTOMBS
+#ifdef HAVE_WCSRTOMBS
   return wcsrtombs((char *) NULL, &pwz, 0, &mbstate);
 #else
   return wxWcstombs((char *) NULL, pwz, 0);
@@ -1094,7 +1090,7 @@ WXDLLEXPORT size_t wxMbstowcs (wchar_t * out, const char * in, size_t outlen)
     return in - origin;
 }
 
-WXDLLEXPORT size_t	wxWcstombs (char * out, const wchar_t * in, size_t outlen)
+WXDLLEXPORT size_t wxWcstombs (char * out, const wchar_t * in, size_t outlen)
 {
     if (!out)
     {
@@ -1451,8 +1447,8 @@ double   WXDLLEXPORT wxAtof(const wxChar *psz)
     wxString str(psz);
     if (str.ToDouble(& d))
         return d;
-    else
-        return 0.0;
+
+    return 0.0;
 #else
     return atof(wxConvLibc.cWX2MB(psz));
 #endif
@@ -1578,7 +1574,7 @@ WXDLLEXPORT wxChar * wxStrtok(wxChar *psz, const wxChar *delim, wxChar **save_pt
 // missing C RTL functions
 // ----------------------------------------------------------------------------
 
-#if wxNEED_STRDUP
+#ifdef wxNEED_STRDUP
 
 char *strdup(const char *s)
 {
@@ -1600,3 +1596,11 @@ void *calloc( size_t num, size_t size )
 
 #endif // __WXWINCE__ <= 211
 
+#ifdef __WXWINCE__
+
+int wxRemove(const wxChar *path)
+{
+    return ::DeleteFile(path) == 0;
+}
+
+#endif