X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5c6eb3a84be918dcfed2496d014549e13af0f0e9..a4301b8f14d21b7d28fc4f6a247b740d945ca6dc:/include/wx/osx/core/stdpaths.h diff --git a/include/wx/osx/core/stdpaths.h b/include/wx/osx/core/stdpaths.h index 3fcb8d5676..4c48407f7b 100644 --- a/include/wx/osx/core/stdpaths.h +++ b/include/wx/osx/core/stdpaths.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: wx/mac/corefoundation/stdpaths.h +// Name: wx/osx/core/stdpaths.h // Purpose: wxStandardPaths for CoreFoundation systems // Author: David Elliott // Modified by: @@ -18,11 +18,21 @@ struct __CFURL; typedef const __CFURL * wxCFURLRef; typedef __CFBundle * wxCFBundleRef; +// we inherit the GUI CF-based wxStandardPaths implementation from the Unix one +// used for console programs if possible (i.e. if we're under a Unix system at +// all) +#if defined(__UNIX__) + #include "wx/unix/stdpaths.h" + #define wxStandardPathsCFBase wxStandardPaths +#else + #define wxStandardPathsCFBase wxStandardPathsBase +#endif + // ---------------------------------------------------------------------------- // wxStandardPaths // ---------------------------------------------------------------------------- -class WXDLLIMPEXP_BASE wxStandardPathsCF : public wxStandardPathsBase +class WXDLLIMPEXP_BASE wxStandardPathsCF : public wxStandardPathsCFBase { public: wxStandardPathsCF(); @@ -54,14 +64,4 @@ protected: wxCFBundleRef m_bundle; }; -// If using UNIX (i.e. darwin) then use UNIX standard paths -#if defined(__UNIX__) -#include "wx/unix/stdpaths.h" -#else -// If compiling wxMac for CarbonLib then we are wxStandardPaths -class WXDLLIMPEXP_BASE wxStandardPaths: public wxStandardPathsCF -{ -}; -#endif - #endif // _WX_MAC_STDPATHS_H_