piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-29 00:59:44 -06:00
Code Issues Packages Projects Releases Wiki Activity

wxWidgets3: update to svn r70933

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

21
Externals/wxWidgets3/include/wx/image.h vendored
View File

@ -2,7 +2,7 @@
// Name: wx/image.h
// Purpose: wxImage class
// Author: Robert Roebling
// RCS-ID: $Id: image.h 67203 2011-03-15 16:42:34Z DS $
// RCS-ID: $Id: image.h 69760 2011-11-14 13:35:52Z VZ $
// Copyright: (c) Robert Roebling
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@ -28,17 +28,20 @@
// which breaks the compilation below
#undef index
#define wxIMAGE_OPTION_QUALITY wxString(wxT("quality"))
#define wxIMAGE_OPTION_FILENAME wxString(wxT("FileName"))
#define wxIMAGE_OPTION_QUALITY wxString(wxS("quality"))
#define wxIMAGE_OPTION_FILENAME wxString(wxS("FileName"))
#define wxIMAGE_OPTION_RESOLUTION wxString(wxT("Resolution"))
#define wxIMAGE_OPTION_RESOLUTIONX wxString(wxT("ResolutionX"))
#define wxIMAGE_OPTION_RESOLUTIONY wxString(wxT("ResolutionY"))
#define wxIMAGE_OPTION_RESOLUTION wxString(wxS("Resolution"))
#define wxIMAGE_OPTION_RESOLUTIONX wxString(wxS("ResolutionX"))
#define wxIMAGE_OPTION_RESOLUTIONY wxString(wxS("ResolutionY"))
#define wxIMAGE_OPTION_RESOLUTIONUNIT wxString(wxT("ResolutionUnit"))
#define wxIMAGE_OPTION_RESOLUTIONUNIT wxString(wxS("ResolutionUnit"))
#define wxIMAGE_OPTION_MAX_WIDTH wxString(wxT("MaxWidth"))
#define wxIMAGE_OPTION_MAX_HEIGHT wxString(wxT("MaxHeight"))
#define wxIMAGE_OPTION_MAX_WIDTH wxString(wxS("MaxWidth"))
#define wxIMAGE_OPTION_MAX_HEIGHT wxString(wxS("MaxHeight"))
#define wxIMAGE_OPTION_ORIGINAL_WIDTH wxString(wxS("OriginalWidth"))
#define wxIMAGE_OPTION_ORIGINAL_HEIGHT wxString(wxS("OriginalHeight"))
// constants used with wxIMAGE_OPTION_RESOLUTIONUNIT
//