X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6cb5e50b0d2259de305f273d2be3d28d7e84dc6a..c50a4038e3c3a13e3d493c432017d371d4916ce6:/include/wx/stdpaths.h

diff --git a/include/wx/stdpaths.h b/include/wx/stdpaths.h
index c69f4435f6..5877ca4450 100644
--- a/include/wx/stdpaths.h
+++ b/include/wx/stdpaths.h
@@ -14,8 +14,6 @@
 
 #include "wx/string.h"
 
-class WXDLLIMPEXP_BASE wxStandardPaths;
-
 // ----------------------------------------------------------------------------
 // wxStandardPaths returns the standard locations in the file system
 // ----------------------------------------------------------------------------
@@ -24,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:
@@ -75,12 +73,20 @@ public:
 
     // virtual dtor for the base class
     virtual ~wxStandardPathsBase();
+
+protected:
+    // append "/appname" suffix if the app name is set (doesn't append the
+    // slash if dir already ends with a slash or dot)
+    static wxString AppendAppName(const wxString& dir);
 };
 
 #if defined(__WXMSW__)
     #include "wx/msw/stdpaths.h"
-#elif defined(__WXMAC_OSX__) || defined(__WXCOCOA__)
-    #include "wx/mac/stdpaths.h"
+// 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"
 #endif