X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/175bb578e0a23e7b2f71dfde16898c184e8a5467..eaff0f0d3f7828c2acd9ebde4979acc0b3fa43b5:/include/wx/stdpaths.h?ds=sidebyside

diff --git a/include/wx/stdpaths.h b/include/wx/stdpaths.h
index 8721d015d0..5877ca4450 100644
--- a/include/wx/stdpaths.h
+++ b/include/wx/stdpaths.h
@@ -14,13 +14,6 @@
 
 #include "wx/string.h"
 
-#if defined(__WXMAC__)
-class WXDLLIMPEXP_BASE wxStandardPathsCF;
-#define wxStandardPaths wxStandardPathsCF
-#else
-class WXDLLIMPEXP_BASE wxStandardPaths;
-#endif
-
 // ----------------------------------------------------------------------------
 // wxStandardPaths returns the standard locations in the file system
 // ----------------------------------------------------------------------------
@@ -29,7 +22,7 @@ class WXDLLIMPEXP_BASE wxStandardPathsBase
 {
 public:
     // return the global standard paths object
-    static wxStandardPaths& Get();
+    static wxStandardPathsBase& Get();
 
 
     // return the directory with system config files:
@@ -89,7 +82,8 @@ protected:
 
 #if defined(__WXMSW__)
     #include "wx/msw/stdpaths.h"
-#elif defined(__WXMAC__) || defined(__WXCOCOA__)
+// We want CoreFoundation paths on both CarbonLib and Darwin (for all ports)
+#elif defined(__WXMAC__) || defined(__DARWIN__)
     #include "wx/mac/corefoundation/stdpaths.h"
 #elif defined(__OS2__)
     #include "wx/os2/stdpaths.h"