Remove extra handling of wxAppTraits::GetStandardPaths() on OS X.
Since the removal of carbon in 5ba67c67e4
there is no longer any special handling required.
This commit is contained in:
@@ -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();
|
||||
|
||||
|
||||
|
@@ -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;
|
||||
|
@@ -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
|
||||
|
Reference in New Issue
Block a user