Applied rowspan patch #15276 (dghart)

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

diff --git a/include/wx/stdpaths.h b/include/wx/stdpaths.h
index 999720d3ac0b26190b96a2bd0619392d215bca5e..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.


@@ -127,10 +129,15 @@ public:
 
     // return the "Documents" directory for the current user
     //
 
     // return the "Documents" directory for the current user
     //

-    // C:\Documents and Settings\username\Documents under Windows,
+    // C:\Documents and Settings\username\My Documents under Windows,

     // $HOME under Unix and ~/Documents under Mac
     virtual wxString GetDocumentsDir() const;
 
     // $HOME under Unix and ~/Documents under Mac
     virtual wxString GetDocumentsDir() const;
 

+    // return the directory for the documents files used by this application:
+    // it's a subdirectory of GetDocumentsDir() constructed using the
+    // application name/vendor if it exists or just GetDocumentsDir() otherwise
+    virtual wxString GetAppDocumentsDir() const;
+

     // return the temporary directory for the current user
     virtual wxString GetTempDir() const;
 
     // return the temporary directory for the current user
     virtual wxString GetTempDir() const;
 


@@ -151,8 +158,8 @@ public:
 
 
 protected:
 
 
 protected:

-    // append the path component, with a leading path seperator if a
-    // path seperator or dot (.) is not already at the end of dir
+    // append the path component, with a leading path separator if a
+    // path separator or dot (.) is not already at the end of dir

     static wxString AppendPathComponent(const wxString& dir, const wxString& component);
 
     // append application information determined by m_usedAppInfo to dir
     static wxString AppendPathComponent(const wxString& dir, const wxString& component);
 
     // append application information determined by m_usedAppInfo to dir


@@ -164,12 +171,12 @@ 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)
     #elif defined(__WXMAC__) || defined(__DARWIN__)
         #include "wx/msw/stdpaths.h"
         #define wxHAS_NATIVE_STDPATHS
     // We want CoreFoundation paths on both CarbonLib and Darwin (for all ports)
     #elif defined(__WXMAC__) || defined(__DARWIN__)

-        #include "wx/mac/corefoundation/stdpaths.h"
+        #include "wx/osx/core/stdpaths.h"

         #define wxHAS_NATIVE_STDPATHS
     #elif defined(__OS2__)
         #include "wx/os2/stdpaths.h"
         #define wxHAS_NATIVE_STDPATHS
     #elif defined(__OS2__)
         #include "wx/os2/stdpaths.h"


@@ -177,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