Don't create multiple parent-less top level frames in layout sample.

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

diff --git a/include/wx/stdpaths.h b/include/wx/stdpaths.h
index 517e7de31d7a79d091ef1e2e48ae1c69eb88ffaf..1bf5af08315716e5b1004b7092fef940d818938f 100644 (file)
--- a/include/wx/stdpaths.h
+++ b/include/wx/stdpaths.h
@@ -17,6 +17,8 @@
 #include "wx/string.h"
 #include "wx/filefn.h"
 
 #include "wx/string.h"
 #include "wx/filefn.h"
 

+class WXDLLIMPEXP_FWD_BASE wxStandardPaths;
+

 // ----------------------------------------------------------------------------
 // wxStandardPaths returns the standard locations in the file system
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxStandardPaths returns the standard locations in the file system
 // ----------------------------------------------------------------------------


@@ -26,7 +28,7 @@
 class WXDLLIMPEXP_BASE wxStandardPathsBase
 {
 public:
 class WXDLLIMPEXP_BASE wxStandardPathsBase
 {
 public:

-    // possible resources categorires
+    // possible resources categories

     enum ResourceCat
     {
         // no special category
     enum ResourceCat
     {
         // no special category


@@ -50,7 +52,7 @@ public:
 
 
     // return the global standard paths object
 
 
     // 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.
 
     // 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 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)
         #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(__UNIX__)
         #include "wx/unix/stdpaths.h"
         #define wxHAS_NATIVE_STDPATHS

-    #elif defined(__PALMOS__)
-        #include "wx/palmos/stdpaths.h"
-        #define wxHAS_NATIVE_STDPATHS

     #endif
 #endif
 
     #endif
 #endif