X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0316942268a5004c3d639fa1cd7df4ea42257dbd..06acc7d9a6cf41c4f80230773cc0bdd2c95cec28:/src/common/filename.cpp diff --git a/src/common/filename.cpp b/src/common/filename.cpp index aae38ea3ef..0867508342 100644 --- a/src/common/filename.cpp +++ b/src/common/filename.cpp @@ -98,6 +98,10 @@ #include #endif +#ifdef __DJGPP__ +#include +#endif + #ifdef __MWERKS__ #include #include @@ -231,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; @@ -297,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,