haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wxStandardPaths().GetExecutablePath(); is not wx 2.9.5 compatible, formatting improvements

This commit is contained in:
Dick Hollenbeck 2013-07-09 00:20:07 -05:00
parent e135b7f669
commit e44fa93776
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
common/edaappl.cpp
View File

@ -452,17 +452,16 @@ bool EDA_APP::SetBinDir()
m_BinDir = FROM_UTF8( native_str ); m_BinDir = FROM_UTF8( native_str );
delete[] native_str; delete[] native_str;
// Linux and Unix #elif defined(__UNIX__) // Linux and non-Apple Unix
#elif defined(__UNIX__) m_BinDir = wxStandardPaths::Get().GetExecutablePath();
m_BinDir = wxStandardPaths().GetExecutablePath();
#else #else
m_BinDir = argv[0]; m_BinDir = argv[0];
#endif // __UNIX__ #endif
/* Use unix notation for paths. I am not sure this is a good idea, // Use unix notation for paths. I am not sure this is a good idea,
* but it simplify compatibility between Windows and Unices // but it simplify compatibility between Windows and Unices
* However it is a potential problem in path handling under Windows // However it is a potential problem in path handling under Windows
*/
m_BinDir.Replace( WIN_STRING_DIR_SEP, UNIX_STRING_DIR_SEP ); m_BinDir.Replace( WIN_STRING_DIR_SEP, UNIX_STRING_DIR_SEP );
// Remove file name form command line: // Remove file name form command line:
@ -1133,11 +1132,13 @@ void EDA_APP::InsertLibraryPath( const wxString& aPaths, size_t aIndex )
} }
} }
bool EDA_APP::LockFile( const wxString& fileName ) bool EDA_APP::LockFile( const wxString& fileName )
{ {
// first make absolute and normalize, to avoid that different lock files // first make absolute and normalize, to avoid that different lock files
// for the same file can be created // for the same file can be created
wxFileName fn = fileName; wxFileName fn = fileName;
fn.MakeAbsolute(); fn.MakeAbsolute();
// semaphore to protect the edition of the file by more than one instance // semaphore to protect the edition of the file by more than one instance
@ -1146,11 +1147,16 @@ bool EDA_APP::LockFile( const wxString& fileName )
// it means that we had an open file and we are opening a different one // it means that we had an open file and we are opening a different one
delete m_oneInstancePerFileChecker; delete m_oneInstancePerFileChecker;
} }
wxString lockFileName = fn.GetFullPath() + wxT( ".lock" ); wxString lockFileName = fn.GetFullPath() + wxT( ".lock" );
lockFileName.Replace( wxT( "/" ), wxT( "_" ) ); lockFileName.Replace( wxT( "/" ), wxT( "_" ) );
// We can have filenames coming from Windows, so also convert Windows separator // We can have filenames coming from Windows, so also convert Windows separator
lockFileName.Replace( wxT( "\\" ), wxT( "_" ) ); lockFileName.Replace( wxT( "\\" ), wxT( "_" ) );
m_oneInstancePerFileChecker = new wxSingleInstanceChecker( lockFileName ); m_oneInstancePerFileChecker = new wxSingleInstanceChecker( lockFileName );
if( m_oneInstancePerFileChecker && if( m_oneInstancePerFileChecker &&
m_oneInstancePerFileChecker->IsAnotherRunning() ) m_oneInstancePerFileChecker->IsAnotherRunning() )
{ {