Moved wxStandardPathsCF into base library when using CarbonLib or Darwin.
Make wxStandardPathsBase::Get() return a wxStandardPathsBase reference. Implement it using wxAppTraits::GetStandardPaths() which is overridden by wxMac and wxCocoa GUI libraries to return a reference to a wxStandardPathsCF. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30506 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -27,6 +27,7 @@
|
||||
#ifndef WX_PRECOMP
|
||||
#include "wx/app.h"
|
||||
#endif //WX_PRECOMP
|
||||
#include "wx/apptrait.h"
|
||||
|
||||
#include "wx/filename.h"
|
||||
#include "wx/stdpaths.h"
|
||||
@@ -42,7 +43,12 @@ static wxStandardPaths gs_stdPaths;
|
||||
// ============================================================================
|
||||
|
||||
/* static */
|
||||
wxStandardPaths& wxStandardPathsBase::Get()
|
||||
wxStandardPathsBase& wxStandardPathsBase::Get()
|
||||
{
|
||||
return wxTheApp->GetTraits()->GetStandardPaths();
|
||||
}
|
||||
|
||||
wxStandardPathsBase& wxAppTraitsBase::GetStandardPaths()
|
||||
{
|
||||
return gs_stdPaths;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user