make sure we don't keep a focus pointer to a window that gets deleted

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

diff --git a/src/common/filename.cpp b/src/common/filename.cpp
index c711152e646da69191a279c53755779fc2536cef..0e3653a6a3899fb2ca94aee12dc6d5bca4e611cb 100644 (file)
--- a/src/common/filename.cpp
+++ b/src/common/filename.cpp
@@ -434,6 +434,9 @@ void wxFileName::Clear()
     m_volume =
     m_name =
     m_ext = wxEmptyString;
+
+    // we don't have any absolute path for now
+    m_relative = TRUE;
 }
 
 /* static */
@@ -639,10 +642,10 @@ wxFileName::CreateTempFileName(const wxString& prefix, wxFile *fileTemp)
     path += _T("XXXXXX");
 
     // we need to copy the path to the buffer in which mkstemp() can modify it
-    wxCharBuffer buf(path.fn_str());
+    wxCharBuffer buf = wxConvFile.cWX2MB( path );
 
     // cast is safe because the string length doesn't change
-    int fdTemp = mkstemp( (char *)buf.data() );
+    int fdTemp = mkstemp( (char*)(const char*) buf );
     if ( fdTemp == -1 )
     {
         // this might be not necessary as mkstemp() on most systems should have
@@ -651,8 +654,8 @@ wxFileName::CreateTempFileName(const wxString& prefix, wxFile *fileTemp)
     }
     else // mkstemp() succeeded
     {
-        path = wxConvFile.cMB2WX(buf);
-
+        path = wxConvFile.cMB2WX( (const char*) buf );
+        
         // avoid leaking the fd
         if ( fileTemp )
         {
@@ -669,14 +672,14 @@ wxFileName::CreateTempFileName(const wxString& prefix, wxFile *fileTemp)
     // same as above
     path += _T("XXXXXX");
 
-    wxCharBuffer buf(path.fn_str());
-    if ( !mktemp( buf ) )
+    wxCharBuffer buf = wxConvFile.cWX2MB( path );
+    if ( !mktemp( (const char*) buf ) )
     {
         path.clear();
     }
     else
     {
-        path = wxConvFile.cMB2WX(buf);
+        path = wxConvFile.cMB2WX( (const char*) buf );
     }
 #else // !HAVE_MKTEMP (includes __DOS__)
     // generate the unique file name ourselves
@@ -1727,7 +1730,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 ;