X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d8efd2198ff050ca5a5726bcad0f42692fe872df..438959cca892a7651634cc3a7aad4819ac49b23c:/include/wx/stdpaths.h

diff --git a/include/wx/stdpaths.h b/include/wx/stdpaths.h
index 517e7de31d..1bf5af0831 100644
--- a/include/wx/stdpaths.h
+++ b/include/wx/stdpaths.h
@@ -17,6 +17,8 @@
 #include "wx/string.h"
 #include "wx/filefn.h"
 
+class WXDLLIMPEXP_FWD_BASE wxStandardPaths;
+
 // ----------------------------------------------------------------------------
 // wxStandardPaths returns the standard locations in the file system
 // ----------------------------------------------------------------------------
@@ -26,7 +28,7 @@
 class WXDLLIMPEXP_BASE wxStandardPathsBase
 {
 public:
-    // possible resources categorires
+    // possible resources categories
     enum ResourceCat
     {
         // no special category
@@ -50,7 +52,7 @@ public:
 
 
     // return the global standard paths object
-    static wxStandardPathsBase& Get();
+    static wxStandardPaths& Get();
 
     // return the path (directory+filename) of the running executable or
     // wxEmptyString if it couldn't be determined.
@@ -169,7 +171,7 @@ protected:
 };
 
 #if wxUSE_STDPATHS
-    #if defined(__WXMSW__)
+    #if defined(__WINDOWS__)
         #include "wx/msw/stdpaths.h"
         #define wxHAS_NATIVE_STDPATHS
     // We want CoreFoundation paths on both CarbonLib and Darwin (for all ports)
@@ -182,9 +184,6 @@ protected:
     #elif defined(__UNIX__)
         #include "wx/unix/stdpaths.h"
         #define wxHAS_NATIVE_STDPATHS
-    #elif defined(__PALMOS__)
-        #include "wx/palmos/stdpaths.h"
-        #define wxHAS_NATIVE_STDPATHS
     #endif
 #endif