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

Fold wxOSX-specific wxImageList into generic version

Browse Source 
Get rid of wxOSX wxImageList implementation as it was 99% identical to
the generic version and the non-identical parts should really have been
made part of the generic version too from the beginning.

Notably, use GetScaled{Width,Height}() in Add() method in the generic
version too now.
This commit is contained in:
Vadim Zeitlin
2018-10-30 02:42:32 +01:00
parent a2a3518b71
commit c374eefd34
8 changed files with 64 additions and 389 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
include/wx/imaglist.h
View File

@@ -41,16 +41,11 @@ enum
#define wxIMAGELIST_DRAW_SELECTED 0x0004
#define wxIMAGELIST_DRAW_FOCUSED 0x0008
#if defined(__WXMSW__) || defined(__WXMAC__)
#define wxHAS_NATIVE_IMAGELIST
#endif
#if !defined(wxHAS_NATIVE_IMAGELIST)
#include "wx/generic/imaglist.h"
#elif defined(__WXMSW__)
#if defined(__WXMSW__)
#include "wx/msw/imaglist.h"
#elif defined(__WXMAC__)
#include "wx/osx/imaglist.h"
#define wxHAS_NATIVE_IMAGELIST
#else
#include "wx/generic/imaglist.h"
#endif
#endif // _WX_IMAGLIST_H_BASE_