Compile fix for prop.

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

diff --git a/src/common/filename.cpp b/src/common/filename.cpp
index cac48112e5d831c7aba4d0d41a415bf73aa02111..732a3f956226ad45387fa83e01b96400d6200b32 100644 (file)
--- a/src/common/filename.cpp
+++ b/src/common/filename.cpp
@@ -124,6 +124,10 @@
 #endif
 #endif
 
+#ifdef __EMX__
+#define MAX_PATH _MAX_PATH
+#endif
+
 // ----------------------------------------------------------------------------
 // private classes
 // ----------------------------------------------------------------------------
@@ -434,6 +438,9 @@ void wxFileName::Clear()
     m_volume =
     m_name =
     m_ext = wxEmptyString;
+
+    // we don't have any absolute path for now
+    m_relative = TRUE;
 }
 
 /* static */
@@ -638,9 +645,11 @@ wxFileName::CreateTempFileName(const wxString& prefix, wxFile *fileTemp)
     // scratch space for mkstemp()
     path += _T("XXXXXX");
 
-    // can use the cast here because the length doesn't change and the string
-    // is not shared
-    int fdTemp = mkstemp((char*)(const char *)path.mb_str());
+    // we need to copy the path to the buffer in which mkstemp() can modify it
+    wxCharBuffer buf = wxConvFile.cWX2MB( path );
+
+    // cast is safe because the string length doesn't change
+    int fdTemp = mkstemp( (char*)(const char*) buf );
     if ( fdTemp == -1 )
     {
         // this might be not necessary as mkstemp() on most systems should have
@@ -649,6 +658,8 @@ wxFileName::CreateTempFileName(const wxString& prefix, wxFile *fileTemp)
     }
     else // mkstemp() succeeded
     {
+        path = wxConvFile.cMB2WX( (const char*) buf );
+        
         // avoid leaking the fd
         if ( fileTemp )
         {
@@ -665,10 +676,15 @@ wxFileName::CreateTempFileName(const wxString& prefix, wxFile *fileTemp)
     // same as above
     path += _T("XXXXXX");
 
-    if ( !mktemp((char *)path.mb_str()) )
+    wxCharBuffer buf = wxConvFile.cWX2MB( path );
+    if ( !mktemp( (const char*) buf ) )
     {
         path.clear();
     }
+    else
+    {
+        path = wxConvFile.cMB2WX( (const char*) buf );
+    }
 #else // !HAVE_MKTEMP (includes __DOS__)
     // generate the unique file name ourselves
     #ifndef __DOS__
@@ -1660,7 +1676,7 @@ bool wxFileName::GetTimes(wxDateTime *dtAccess,
 {
 #if defined(__UNIX_LIKE__) || defined(__WXMAC__) || (defined(__DOS__) && defined(__WATCOMC__))
     wxStructStat stBuf;
-    if ( wxStat(GetFullPath().fn_str(), &stBuf) == 0 )
+    if ( wxStat( GetFullPath().c_str(), &stBuf) == 0 )
     {
         if ( dtAccess )
             dtAccess->Set(stBuf.st_atime);
@@ -1718,7 +1734,7 @@ public :
     m_type = from.m_type ;
     m_creator = from.m_creator ;
   }
-  MacDefaultExtensionRecord( char * extension , OSType type , OSType creator )
+  MacDefaultExtensionRecord( const char * extension , OSType type , OSType creator )
   {
     strncpy( m_ext , extension , kMacExtensionMaxLength ) ;
     m_ext[kMacExtensionMaxLength] = 0 ;
@@ -1745,7 +1761,7 @@ static void MacEnsureDefaultExtensionsLoaded()
 {
   if ( !gMacDefaultExtensionsInited )
   {
-    
+
     // load the default extensions
     MacDefaultExtensionRecord defaults[1] =
     {
@@ -1754,7 +1770,7 @@ static void MacEnsureDefaultExtensionsLoaded()
     } ;
     // we could load the pc exchange prefs here too
 
-    for ( int i = 0 ; i < WXSIZEOF( defaults ) ; ++i )
+    for ( size_t i = 0 ; i < WXSIZEOF( defaults ) ; ++i )
     {
       gMacDefaultExtensions.Add( defaults[i] ) ;
     }