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

Remove extra handling of wxAppTraits::GetStandardPaths() on OS X.

Browse Source 
Since the removal of carbon in 5ba67c67e4 there is no longer any special handling required.
This commit is contained in:
Tobias Taschner
2016-03-04 15:16:04 +01:00
parent 1125dd8c12
commit c17202c696
3 changed files with 0 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/wx/apptrait.h
View File

@@ -73,7 +73,6 @@ public:
virtual wxRendererNative *CreateRenderer() = 0; virtual wxRendererNative *CreateRenderer() = 0;
// wxStandardPaths object is normally the same for wxBase and wxGUI // wxStandardPaths object is normally the same for wxBase and wxGUI
// except in the case of wxMac and wxCocoa
virtual wxStandardPaths& GetStandardPaths(); virtual wxStandardPaths& GetStandardPaths();

3
include/wx/unix/apptrait.h
View File

@@ -58,9 +58,6 @@ public:
virtual void MutexGuiLeave() wxOVERRIDE; virtual void MutexGuiLeave() wxOVERRIDE;
#endif #endif
#if defined(__WXMAC__) && wxUSE_STDPATHS
virtual wxStandardPaths& GetStandardPaths() wxOVERRIDE;
#endif
wxPortId GetToolkitVersion(int *majVer = NULL, wxPortId GetToolkitVersion(int *majVer = NULL,
int *minVer = NULL, int *minVer = NULL,
int *microVer = NULL) const wxOVERRIDE; int *microVer = NULL) const wxOVERRIDE;

20
src/osx/core/utilsexc_cf.cpp
View File

@@ -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 #if wxUSE_SOCKETS
// we need to implement this method in a file of the core library as it should // we need to implement this method in a file of the core library as it should