corrected return value

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

diff --git a/src/common/filename.cpp b/src/common/filename.cpp
index 4dc91cb910f56bd7d1af21eb1957f4f63416a1b4..086750834279f7e5f1887b43c764ad252f90a038 100644 (file)
--- a/src/common/filename.cpp
+++ b/src/common/filename.cpp
@@ -82,10 +82,7 @@
 #include "wx/config.h"          // for wxExpandEnvVars
 #include "wx/utils.h"
 #include "wx/file.h"
-
-#if wxUSE_DYNAMIC_LOADER || wxUSE_DYNLIB_CLASS
-#include "wx/dynlib.h"
-#endif
+//#include "wx/dynlib.h"        // see GetLongPath below, code disabled.
 
 // For GetShort/LongPathName
 #ifdef __WIN32__
@@ -101,6 +98,10 @@
 #include <unistd.h>
 #endif
 
+#ifdef __DJGPP__
+#include <unistd.h>
+#endif
+
 #ifdef __MWERKS__
 #include <stat.h>
 #include <unistd.h>
@@ -234,6 +235,15 @@ void wxFileName::Assign(const wxString& volume,
                         const wxString& name,
                         const wxString& ext,
                         wxPathFormat format )
+{
+    SetPath( path, format );
+
+    m_volume = volume;
+    m_ext = ext;
+    m_name = name;
+}
+
+void wxFileName::SetPath( const wxString &path, wxPathFormat format )
 {
     wxPathFormat my_format = GetFormat( format );
     wxString my_path = path;
@@ -300,10 +310,10 @@ void wxFileName::Assign(const wxString& volume,
             }
         }
     }
-
-    m_volume = volume;
-    m_ext = ext;
-    m_name = name;
+    else
+    {
+        m_relative = TRUE;
+    }
 }
 
 void wxFileName::Assign(const wxString& fullpath,