X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ecf9559d5703afb1732f2f04a86d3732be6fed37..52170c5b4419c63d6e0083df411aad420395ec98:/include/wx/stdpaths.h?ds=sidebyside diff --git a/include/wx/stdpaths.h b/include/wx/stdpaths.h index 80d3a8e89d..9f6c619f63 100644 --- a/include/wx/stdpaths.h +++ b/include/wx/stdpaths.h @@ -14,8 +14,6 @@ #include "wx/defs.h" -#if wxUSE_STDPATHS - #include "wx/string.h" #include "wx/filefn.h" @@ -23,6 +21,8 @@ // 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: @@ -43,6 +43,11 @@ public: // return the global standard paths object static wxStandardPathsBase& Get(); + // return the path (directory+filename) of the running executable or + // wxEmptyString if it couldn't be determined. + // The path is returned as an absolute path whenever possible. + // Default implementation only try to use wxApp->argv[0]. + virtual wxString GetExecutablePath() const; // return the directory with system config files: // /etc under Unix, c:\Documents and Settings\All Users\Application Data @@ -104,7 +109,7 @@ public: // 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 { @@ -130,28 +135,41 @@ protected: static wxString AppendAppName(const wxString& dir); }; -#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 // ---------------------------------------------------------------------------- +// 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: void SetInstallPrefix(const wxString& prefix) { m_prefix = prefix; } wxString GetInstallPrefix() const { return m_prefix; } + + virtual wxString GetExecutablePath() const { return m_prefix; } virtual wxString GetConfigDir() const { return m_prefix; } virtual wxString GetUserConfigDir() const { return m_prefix; } virtual wxString GetDataDir() const { return m_prefix; } @@ -163,10 +181,7 @@ public: private: wxString m_prefix; }; - -#endif - -#endif // wxUSE_STDPATHS +#endif // !wxHAS_NATIVE_STDPATHS #endif // _WX_STDPATHS_H_