made Add() public so that it could be called for addition HWNDs making part of the...

[wxWidgets.git] / include / wx / stdpaths.h

diff --git a/include/wx/stdpaths.h b/include/wx/stdpaths.h
index e96bfcd681a7cbb0b915e9a46d88c04cf795fe65..9f83385657901ba2559ed4fdb312ad8dc7ea2809 100644 (file)
--- 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:
@@ -84,10 +82,15 @@ protected:
 
 #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"
+#elif defined(__PALMOS__)
+    #include "wx/palmos/stdpaths.h"
 #endif
 
 #endif // _WX_STDPATHS_H_