X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3b01b1fe4cb656f39290bf7f3891667855abe601..f6840be66eb772c08f0cbb43de677509d5d132bb:/include/wx/stdpaths.h

diff --git a/include/wx/stdpaths.h b/include/wx/stdpaths.h
index dba20f0284..ed75f6e231 100644
--- a/include/wx/stdpaths.h
+++ b/include/wx/stdpaths.h
@@ -12,14 +12,11 @@
 #ifndef _WX_STDPATHS_H_
 #define _WX_STDPATHS_H_
 
-#include "wx/string.h"
+#include "wx/defs.h"
 
-#if defined(__WXMAC__)
-class WXDLLIMPEXP_BASE wxStandardPathsCF;
-#define wxStandardPaths wxStandardPathsCF
-#else
-class WXDLLIMPEXP_BASE wxStandardPaths;
-#endif
+#if wxUSE_STDPATHS
+
+#include "wx/string.h"
 
 // ----------------------------------------------------------------------------
 // wxStandardPaths returns the standard locations in the file system
@@ -29,7 +26,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,11 +86,18 @@ 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"
 #elif defined(__UNIX__)
     #include "wx/unix/stdpaths.h"
+#elif defined(__PALMOS__)
+    #include "wx/palmos/stdpaths.h"
 #endif
 
+#endif // wxUSE_STDPATHS
+
 #endif // _WX_STDPATHS_H_