wxWidgets3: update to svn r70933

This commit is contained in:
Shawn Hoffman
2012-03-17 18:12:27 -07:00
parent 0ed8af2287
commit a648aca65c
906 changed files with 39468 additions and 17244 deletions

View File

@ -4,7 +4,7 @@
// Author: Vadim Zeitlin
// Modified by:
// Created: 2004-10-17
// RCS-ID: $Id: stdpaths.h 65652 2010-09-27 11:51:50Z VZ $
// RCS-ID: $Id: stdpaths.h 70796 2012-03-04 00:29:31Z VZ $
// Copyright: (c) 2004 Vadim Zeitlin <vadim@wxwindows.org>
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
@ -171,7 +171,7 @@ protected:
};
#if wxUSE_STDPATHS
#if defined(__WXMSW__)
#if defined(__WINDOWS__)
#include "wx/msw/stdpaths.h"
#define wxHAS_NATIVE_STDPATHS
// We want CoreFoundation paths on both CarbonLib and Darwin (for all ports)
@ -184,9 +184,6 @@ protected:
#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