minor changes and bug corrections (interface unchanged)

[wxWidgets.git] / src / common / filefn.cpp

diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp
index b0fff2802d02408161a60044999d0bb0042a69a2..793407485233ae5df8677a48df633bd9247426d4 100644 (file)
--- a/src/common/filefn.cpp
+++ b/src/common/filefn.cpp
@@ -267,6 +267,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)
 {
 // Destructive removal of /./ and /../ stuff
 char *wxRealPath (char *path)
 {


@@ -721,7 +736,11 @@ wxDos2UnixFilename (char *s)
 }
 
 void 
 }
 
 void 

+#ifdef __WXMSW__

 wxUnix2DosFilename (char *s)
 wxUnix2DosFilename (char *s)

+#else
+wxUnix2DosFilename (char *WXUNUSED(s))
+#endif

 {
 // Yes, I really mean this to happen under DOS only! JACS
 #ifdef __WXMSW__
 {
 // Yes, I really mean this to happen under DOS only! JACS
 #ifdef __WXMSW__


@@ -1331,7 +1350,7 @@ void WXDLLEXPORT wxSplitPath(const char *pszFileName,
   uint nPosDos = pSepDos ? pSepDos - pszFileName : 0;
   if ( nPosDos > nPosUnix )
     nPosUnix = nPosDos;
   uint nPosDos = pSepDos ? pSepDos - pszFileName : 0;
   if ( nPosDos > nPosUnix )
     nPosUnix = nPosDos;

-  uint nLen = Strlen(pszFileName);
+//  uint nLen = Strlen(pszFileName);

 
   if ( pstrPath )
     *pstrPath = wxString(pszFileName, nPosUnix);
 
   if ( pstrPath )
     *pstrPath = wxString(pszFileName, nPosUnix);