X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2049ba38adafa0ec146880de29f26e32dd69a125..d1427b705318677afe28b1291867f6930c8823a7:/src/common/filefn.cpp

diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp
index 2a17499d5e..90b49c111d 100644
--- a/src/common/filefn.cpp
+++ b/src/common/filefn.cpp
@@ -26,6 +26,7 @@
 #endif
 
 #include "wx/utils.h"
+#include <wx/intl.h>
 
 #include <ctype.h>
 #include <stdio.h>
@@ -267,6 +268,21 @@ void wxStripExtension(char *buffer)
   }
 }
 
+void wxStripExtension(wxString& buffer)
+{
+  size_t len = buffer.Length();
+  size_t i = len-1;
+  while (i > 0)
+  {
+    if (buffer.GetChar(i) == '.')
+    {
+      buffer = buffer.Left(i);
+      break;
+    }
+    i --;
+  }
+}
+
 // Destructive removal of /./ and /../ stuff
 char *wxRealPath (char *path)
 {
@@ -721,7 +737,11 @@ wxDos2UnixFilename (char *s)
 }
 
 void 
+#ifdef __WXMSW__
 wxUnix2DosFilename (char *s)
+#else
+wxUnix2DosFilename (char *WXUNUSED(s))
+#endif
 {
 // Yes, I really mean this to happen under DOS only! JACS
 #ifdef __WXMSW__
@@ -941,7 +961,7 @@ char *wxGetTempFileName(const wxString& prefix, char *buf)
 	  return buf;
 	}
     }
-  cerr << "wxWindows: error finding temporary file name.\n";
+  cerr << _("wxWindows: error finding temporary file name.\n");
   if (buf) buf[0] = 0;
   return NULL;
 #endif
@@ -1285,7 +1305,7 @@ bool wxFindFileInPath(wxString *pStr, const char *pszPath, const char *pszFile)
 {
   // we assume that it's not empty
   wxCHECK_MSG( !IsEmpty(pszFile), FALSE, 
-               "empty file name in wxFindFileInPath");
+               _("empty file name in wxFindFileInPath"));
 
   // skip path separator in the beginning of the file name if present
   if ( wxIsPathSeparator(*pszFile) )
@@ -1315,3 +1335,37 @@ bool wxFindFileInPath(wxString *pStr, const char *pszPath, const char *pszFile)
   return pc != NULL;  // if true => we breaked from the loop
 }
 
+void WXDLLEXPORT wxSplitPath(const char *pszFileName,
+                             wxString *pstrPath,
+                             wxString *pstrName,
+                             wxString *pstrExt)
+{
+  wxCHECK_RET( pszFileName, _("NULL file name in wxSplitPath") );
+
+  const char *pDot = strrchr(pszFileName, FILE_SEP_EXT);
+  const char *pSepUnix = strrchr(pszFileName, FILE_SEP_PATH_UNIX);
+  const char *pSepDos = strrchr(pszFileName, FILE_SEP_PATH_DOS);
+
+  // take the last of the two
+  uint nPosUnix = pSepUnix ? pSepUnix - pszFileName : 0;
+  uint nPosDos = pSepDos ? pSepDos - pszFileName : 0;
+  if ( nPosDos > nPosUnix )
+    nPosUnix = nPosDos;
+//  uint nLen = Strlen(pszFileName);
+
+  if ( pstrPath )
+    *pstrPath = wxString(pszFileName, nPosUnix);
+  if ( pDot ) {
+    uint nPosDot = pDot - pszFileName;
+    if ( pstrName )
+      *pstrName = wxString(pszFileName + nPosUnix + 1, nPosDot - nPosUnix);
+    if ( pstrExt )
+      *pstrExt = wxString(pszFileName + nPosDot + 1);
+  }
+  else {
+    if ( pstrName )
+      *pstrName = wxString(pszFileName + nPosUnix + 1);
+    if ( pstrExt )
+      pstrExt->Empty();
+  }
+}