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

Moved wxStandardPathsCF into base library when using CarbonLib or Darwin.

Browse Source 
Make wxStandardPathsBase::Get() return a wxStandardPathsBase reference.
Implement it using wxAppTraits::GetStandardPaths() which is overridden by
wxMac and wxCocoa GUI libraries to return a reference to a wxStandardPathsCF.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30506 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Elliott
2004-11-12 21:21:00 +00:00
parent b7a2ebe671
commit fc480dc16b
11 changed files with 2731 additions and 1388 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/wx/stdpaths.h
View File

@@ -14,13 +14,6 @@
#include "wx/string.h"
#if defined(__WXMAC__)
class WXDLLIMPEXP_BASE wxStandardPathsCF;
#define wxStandardPaths wxStandardPathsCF
#else
class WXDLLIMPEXP_BASE wxStandardPaths;
#endif
// ----------------------------------------------------------------------------
// wxStandardPaths returns the standard locations in the file system
// ----------------------------------------------------------------------------
@@ -29,7 +22,7 @@ class WXDLLIMPEXP_BASE wxStandardPathsBase
{
public:
// return the global standard paths object
static wxStandardPaths& Get();
static wxStandardPathsBase& Get();
// return the directory with system config files:
@@ -89,7 +82,8 @@ protected:
#if defined(__WXMSW__)
#include "wx/msw/stdpaths.h"
#elif defined(__WXMAC__) || defined(__WXCOCOA__)
// 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"