fix for wxComboBox flicker on create (patch 598891)

[wxWidgets.git] / src / unix / snglinst.cpp

diff --git a/src/unix/snglinst.cpp b/src/unix/snglinst.cpp
index 9cc4155e80ec11481daa02f0a1410c13f18dfb7d..8ccedd75dfff688f8f6535b24fd12d5b12d7e360 100644 (file)
--- a/src/unix/snglinst.cpp
+++ b/src/unix/snglinst.cpp
@@ -151,7 +151,7 @@ private:
 LockResult wxSingleInstanceCheckerImpl::CreateLockFile()
 {
     // try to open the file
-    m_fdLock = open(m_nameLock,
+    m_fdLock = open(m_nameLock.fn_str(),
                     O_WRONLY | O_CREAT | O_EXCL,
                     S_IRUSR | S_IWUSR);
 
@@ -192,7 +192,7 @@ LockResult wxSingleInstanceCheckerImpl::CreateLockFile()
                 wxLogSysError(_("Failed to lock the lock file '%s'"),
                               m_nameLock.c_str());
 
-                unlink(m_nameLock);
+                unlink(m_nameLock.fn_str());
 
                 return LOCK_ERROR;
             }
@@ -257,7 +257,7 @@ bool wxSingleInstanceCheckerImpl::Create(const wxString& name)
         {
             if ( kill(m_pidLocker, 0) != 0 )
             {
-                if ( unlink(name) != 0 )
+                if ( unlink(name.fn_str()) != 0 )
                 {
                     wxLogError(_("Failed to remove stale lock file '%s'."),
                                name.c_str());
@@ -291,7 +291,7 @@ void wxSingleInstanceCheckerImpl::Unlock()
 {
     if ( m_fdLock != -1 )
     {
-        if ( unlink(m_nameLock) != 0 )
+        if ( unlink(m_nameLock.fn_str()) != 0 )
         {
             wxLogSysError(_("Failed to remove lock file '%s'"),
                           m_nameLock.c_str());