Better fix

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

diff --git a/include/wx/stdpaths.h b/include/wx/stdpaths.h
index 7828b69e625c77eb35b13a81ac0bb73bee493ded..999720d3ac0b26190b96a2bd0619392d215bca5e 100644 (file)
--- a/include/wx/stdpaths.h
+++ b/include/wx/stdpaths.h
@@ -14,8 +14,6 @@
 
 #include "wx/defs.h"
 
 
 #include "wx/defs.h"
 

-#if wxUSE_STDPATHS
-

 #include "wx/string.h"
 #include "wx/filefn.h"
 
 #include "wx/string.h"
 #include "wx/filefn.h"
 


@@ -23,6 +21,8 @@
 // wxStandardPaths returns the standard locations in the file system
 // ----------------------------------------------------------------------------
 
 // wxStandardPaths returns the standard locations in the file system
 // ----------------------------------------------------------------------------
 

+// NB: This is always compiled in, wxUSE_STDPATHS=0 only disables native
+//     wxStandardPaths class, but a minimal version is always available

 class WXDLLIMPEXP_BASE wxStandardPathsBase
 {
 public:
 class WXDLLIMPEXP_BASE wxStandardPathsBase
 {
 public:


@@ -39,6 +39,15 @@ public:
         ResourceCat_Max
     };
 
         ResourceCat_Max
     };
 

+    // what should we use to construct paths unique to this application:
+    // (AppInfo_AppName and AppInfo_VendorName can be combined together)
+    enum
+    {
+        AppInfo_None       = 0,  // nothing
+        AppInfo_AppName    = 1,  // the application name
+        AppInfo_VendorName = 2   // the vendor name
+    };
+

 
     // return the global standard paths object
     static wxStandardPathsBase& Get();
 
     // return the global standard paths object
     static wxStandardPathsBase& Get();


@@ -109,7 +118,7 @@ public:
     // different under Unix for message catalog category (namely the standard
     // prefix/share/locale/lang/LC_MESSAGES)
     virtual wxString
     // different under Unix for message catalog category (namely the standard
     // prefix/share/locale/lang/LC_MESSAGES)
     virtual wxString

-    GetLocalizedResourcesDir(const wxChar *lang,
+    GetLocalizedResourcesDir(const wxString& lang,

                              ResourceCat WXUNUSED(category)
                                 = ResourceCat_None) const
     {
                              ResourceCat WXUNUSED(category)
                                 = ResourceCat_None) const
     {


@@ -126,32 +135,62 @@ public:
     virtual wxString GetTempDir() const;
 
 
     virtual wxString GetTempDir() const;
 
 

+    // ctor for the base class
+    wxStandardPathsBase();
+

     // virtual dtor for the base class
     virtual ~wxStandardPathsBase();
 
     // virtual dtor for the base class
     virtual ~wxStandardPathsBase();
 

+    // Information used by AppendAppInfo
+    void UseAppInfo(int info)
+    {
+        m_usedAppInfo = info;
+    }
+
+    bool UsesAppInfo(int info) const { return (m_usedAppInfo & info) != 0; }
+
+

 protected:
 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);
+    // append the path component, with a leading path seperator if a
+    // path seperator 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
+    wxString AppendAppInfo(const wxString& dir) const;
+
+
+    // combination of AppInfo_XXX flags used by AppendAppInfo()
+    int m_usedAppInfo;

 };
 
 };
 

-#if defined(__WXMSW__)
-    #include "wx/msw/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"
-#else
+#if wxUSE_STDPATHS
+    #if defined(__WXMSW__)
+        #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"
+        #define wxHAS_NATIVE_STDPATHS
+    #elif defined(__OS2__)
+        #include "wx/os2/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

 
 // ----------------------------------------------------------------------------
 // Minimal generic implementation
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // Minimal generic implementation
 // ----------------------------------------------------------------------------
 

+// NB: Note that this minimal implementation is compiled in even if
+//     wxUSE_STDPATHS=0, so that our code can still use wxStandardPaths.
+
+#ifndef wxHAS_NATIVE_STDPATHS

 class WXDLLIMPEXP_BASE wxStandardPaths : public wxStandardPathsBase
 {
 public:
 class WXDLLIMPEXP_BASE wxStandardPaths : public wxStandardPathsBase
 {
 public:


@@ -170,10 +209,7 @@ public:
 private:
     wxString m_prefix;
 };
 private:
     wxString m_prefix;
 };

-
-#endif
-
-#endif // wxUSE_STDPATHS
+#endif // !wxHAS_NATIVE_STDPATHS

 
 #endif // _WX_STDPATHS_H_
 
 
 #endif // _WX_STDPATHS_H_