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: wxWidgets team
// Modified by:
// Created: 13.01.00
// RCS-ID: $Id: metafile.h 54125 2008-06-11 19:17:41Z SC $
// RCS-ID: $Id: metafile.h 70345 2012-01-15 01:05:28Z VZ $
// Copyright: (c) wxWidgets team
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
@ -25,11 +25,7 @@
#if defined(__WXMSW__)
#if wxUSE_ENH_METAFILE
#if defined(__WXPALMOS__)
#include "wx/palmos/enhmeta.h"
#else
#include "wx/msw/enhmeta.h"
#endif
#include "wx/msw/enhmeta.h"
#if wxUSE_WIN_METAFILES_ALWAYS
// use normal metafiles as well
@ -45,11 +41,7 @@
#define wxMETAFILE_IS_ENH
#endif // wxUSE_WIN_METAFILES_ALWAYS
#else // !wxUSE_ENH_METAFILE
#if defined(__WXPALMOS__)
#include "wx/palmos/metafile.h"
#else
#include "wx/msw/metafile.h"
#endif
#include "wx/msw/metafile.h"
#endif
#elif defined(__WXPM__)
#include "wx/os2/metafile.h"