Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed compilation bug in prior checkin (Pt. 2)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36339 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Surovell
2005-12-04 05:00:26 +00:00
parent 9238471679
commit ca7d651d5d
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/unix/stdpaths.cpp
View File

@@ -53,7 +53,7 @@ void wxStandardPaths::SetInstallPrefix(const wxString& prefix)
wxString wxStandardPaths::GetInstallPrefix() const wxString wxStandardPaths::GetInstallPrefix() const
{ {
if ( m_prefix.empty() ) if (m_prefix.empty())
{ {
wxStandardPaths *pathPtr = wx_const_cast(wxStandardPaths *, this); wxStandardPaths *pathPtr = wx_const_cast(wxStandardPaths *, this);
@@ -63,14 +63,14 @@ wxString wxStandardPaths::GetInstallPrefix() const
int result; int result;
// FIXME: is readlink() Unicode-aware or not??? // FIXME: is readlink() Unicode-aware or not???
result = readlink( (const char*)wxT("/proc/self/exe"), buf, WXSIZEOF(buf) - sizeof(wxChar) ); result = readlink( (const char*)wxT("/proc/self/exe"), (char*)buf, WXSIZEOF(buf) - sizeof(wxChar) );
if (result != -1) if (result != -1)
{ {
buf[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( wxChar('/')) ); 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 );