Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

derive wxStandardPathsCF from Unix wxStandardPaths implementation to make it possible to return it from wxGUIAppTraits::GetStandardPaths()

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60950 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-06-07 12:56:43 +00:00
parent ae042ac1e2
commit 0049c31e8d
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
include/wx/osx/core/stdpaths.h
View File

@@ -18,11 +18,21 @@ struct __CFURL;
typedef const __CFURL * wxCFURLRef; typedef const __CFURL * wxCFURLRef;
typedef __CFBundle * wxCFBundleRef; 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 // wxStandardPaths
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
class WXDLLIMPEXP_BASE wxStandardPathsCF : public wxStandardPathsBase class WXDLLIMPEXP_BASE wxStandardPathsCF : public wxStandardPathsCFBase
{ {
public: public:
wxStandardPathsCF(); wxStandardPathsCF();
@@ -54,14 +64,4 @@ protected:
wxCFBundleRef m_bundle; 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_ #endif // _WX_MAC_STDPATHS_H_