wxStandardPathsCF::GetExecutablePath() implementation doesn't use CF API but Carbon one and so doesn't compile in wxCocoa, don't use it there
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43381 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -151,8 +151,10 @@ wxString wxStandardPathsCF::GetDataDir() const
|
|||||||
return GetFromFunc(CFBundleCopySharedSupportURL);
|
return GetFromFunc(CFBundleCopySharedSupportURL);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// TODO: implement this using real CoreFoundation API instead of Carbon API
|
||||||
wxString wxStandardPathsCF::GetExecutablePath() const
|
wxString wxStandardPathsCF::GetExecutablePath() const
|
||||||
{
|
{
|
||||||
|
#ifdef __WXMAC__
|
||||||
ProcessInfoRec processinfo;
|
ProcessInfoRec processinfo;
|
||||||
ProcessSerialNumber procno ;
|
ProcessSerialNumber procno ;
|
||||||
FSSpec fsSpec;
|
FSSpec fsSpec;
|
||||||
@@ -165,6 +167,9 @@ wxString wxStandardPathsCF::GetExecutablePath() const
|
|||||||
|
|
||||||
GetProcessInformation( &procno , &processinfo ) ;
|
GetProcessInformation( &procno , &processinfo ) ;
|
||||||
return wxMacFSSpec2MacFilename(&fsSpec);
|
return wxMacFSSpec2MacFilename(&fsSpec);
|
||||||
|
#else
|
||||||
|
return wxStandardPathsBase::GetExecutablePath();
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
wxString wxStandardPathsCF::GetLocalDataDir() const
|
wxString wxStandardPathsCF::GetLocalDataDir() const
|
||||||
|
Reference in New Issue
Block a user