fixed compilation bug in prior checkin
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36338 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
74ebd40690
commit
9238471679
@ -62,14 +62,15 @@ wxString wxStandardPaths::GetInstallPrefix() const
|
|||||||
wxChar buf[4096];
|
wxChar buf[4096];
|
||||||
int result;
|
int result;
|
||||||
|
|
||||||
result = readlink( wxT("/proc/self/exe"), buf, WXSIZEOF(buf) - sizeof(wxChar) );
|
// FIXME: is readlink() Unicode-aware or not???
|
||||||
|
result = readlink( (const char*)wxT("/proc/self/exe"), buf, WXSIZEOF(buf) - sizeof(wxChar) );
|
||||||
if (result != -1)
|
if (result != -1)
|
||||||
{
|
{
|
||||||
buff[result] = wxChar(0);
|
buf[result] = wxChar(0);
|
||||||
wxString exeStr( buf, wxConvLibc );
|
wxString exeStr( buf, wxConvLibc );
|
||||||
|
|
||||||
// consider that we're in the last "bin" subdirectory of our prefix
|
// consider that we're in the last "bin" subdirectory of our prefix
|
||||||
wxString basename( wxString( wxTheApp->argv[0]).AfterLast(_T('/')) );
|
wxString basename( wxString( wxTheApp->argv[0]).AfterLast( wxChar('/')) );
|
||||||
size_t pos = exeStr.find( wxT("/bin/") + basename );
|
size_t pos = exeStr.find( wxT("/bin/") + basename );
|
||||||
if (pos != wxString::npos)
|
if (pos != wxString::npos)
|
||||||
pathPtr->m_prefix.assign( exeStr, 0, pos );
|
pathPtr->m_prefix.assign( exeStr, 0, pos );
|
||||||
|
Loading…
Reference in New Issue
Block a user