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

Avoid -Wexpansion-to-defined clang warning in wxOSX

Browse Source 
Define wxCLRDLGG_USE_PREVIEW_WITH_ALPHA as either 0 or 1 instead of using an
expression involving "defined" for it as the latter provoked many clang
-Wexpansion-to-defined warnings, which were harmless but very annoying.
This commit is contained in:
Vadim Zeitlin
2017-04-30 22:59:54 +02:00
committed by Vadim Zeitlin
parent 3105134548
commit e851db7e9e
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/wx/generic/colrdlgg.h
View File

@@ -21,9 +21,12 @@
// Preview with opacity is possible only if wxGCDC and wxStaticBitmap are // Preview with opacity is possible only if wxGCDC and wxStaticBitmap are
// available and currently it only works in wxOSX and wxMSW as it uses wxBitmap // available and currently it only works in wxOSX and wxMSW as it uses wxBitmap
// UseAlpha() and HasAlpha() methods which only these ports provide. // UseAlpha() and HasAlpha() methods which only these ports provide.
#define wxCLRDLGG_USE_PREVIEW_WITH_ALPHA \ #if ((wxUSE_GRAPHICS_CONTEXT && wxUSE_STATBMP) && \
((wxUSE_GRAPHICS_CONTEXT && wxUSE_STATBMP) && \
(defined(__WXMSW__) || defined(__WXOSX__))) (defined(__WXMSW__) || defined(__WXOSX__)))
#define wxCLRDLGG_USE_PREVIEW_WITH_ALPHA 1
#else
#define wxCLRDLGG_USE_PREVIEW_WITH_ALPHA 0
#endif
#if wxCLRDLGG_USE_PREVIEW_WITH_ALPHA #if wxCLRDLGG_USE_PREVIEW_WITH_ALPHA
class wxStaticBitmap; class wxStaticBitmap;