diff --git a/include/wx/apptrait.h b/include/wx/apptrait.h index d69a7b964c..51168eb5d6 100644 --- a/include/wx/apptrait.h +++ b/include/wx/apptrait.h @@ -73,7 +73,6 @@ public: virtual wxRendererNative *CreateRenderer() = 0; // wxStandardPaths object is normally the same for wxBase and wxGUI - // except in the case of wxMac and wxCocoa virtual wxStandardPaths& GetStandardPaths(); diff --git a/include/wx/unix/apptrait.h b/include/wx/unix/apptrait.h index dc96980526..1095a3c37b 100644 --- a/include/wx/unix/apptrait.h +++ b/include/wx/unix/apptrait.h @@ -58,9 +58,6 @@ public: virtual void MutexGuiLeave() wxOVERRIDE; #endif -#if defined(__WXMAC__) && wxUSE_STDPATHS - virtual wxStandardPaths& GetStandardPaths() wxOVERRIDE; -#endif wxPortId GetToolkitVersion(int *majVer = NULL, int *minVer = NULL, int *microVer = NULL) const wxOVERRIDE; diff --git a/src/osx/core/utilsexc_cf.cpp b/src/osx/core/utilsexc_cf.cpp index e071bd255f..2614cb4fc4 100644 --- a/src/osx/core/utilsexc_cf.cpp +++ b/src/osx/core/utilsexc_cf.cpp @@ -152,26 +152,6 @@ wxEventLoopSourcesManagerBase* wxGUIAppTraits::GetEventLoopSourcesManager() ///////////////////////////////////////////////////////////////////////////// -// NOTE: This doesn't really belong here but this was a handy file to -// put it in because it's already compiled for wxCocoa and wxMac GUI lib. -#if wxUSE_STDPATHS -wxStandardPaths& wxGUIAppTraits::GetStandardPaths() -{ - // Derive a class just to be able to create it: wxStandardPaths ctor is - // protected to prevent its misuse, but it also means we can't create an - // object of this class directly. - class wxStandardPathsDefault : public wxStandardPaths - { - public: - wxStandardPathsDefault() { } - }; - - static wxStandardPathsDefault gs_stdPaths; - - return gs_stdPaths; -} -#endif - #if wxUSE_SOCKETS // we need to implement this method in a file of the core library as it should