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

@ -5,7 +5,7 @@
// Modified by:
// Created:
// Copyright: (c) Julian Smart
// RCS-ID: $Id: imaglist.h 63553 2010-02-25 00:03:53Z VZ $
// RCS-ID: $Id: imaglist.h 70345 2012-01-15 01:05:28Z VZ $
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@ -42,7 +42,7 @@ enum
#define wxIMAGELIST_DRAW_SELECTED 0x0004
#define wxIMAGELIST_DRAW_FOCUSED 0x0008
#if defined(__WXMSW__) || defined(__WXMAC__) || defined(__WXPALMOS__)
#if defined(__WXMSW__) || defined(__WXMAC__)
#define wxHAS_NATIVE_IMAGELIST
#endif
@ -52,8 +52,6 @@ enum
#include "wx/msw/imaglist.h"
#elif defined(__WXMAC__)
#include "wx/osx/imaglist.h"
#elif defined(__WXPALMOS__)
#include "wx/palmos/imaglist.h"
#endif
#endif // _WX_IMAGLIST_H_BASE_