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

build fix for wxUSE_VALIDATORS==0 when NULL is defined to be nullptr

Browse Source 
casting nullptr is not allowed

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@76314 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2014-04-11 16:04:36 +00:00
parent 7d8501c892
commit 129ed048d8
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/wx/validate.h
View File

@@ -104,7 +104,8 @@ extern WXDLLIMPEXP_DATA_CORE(const wxValidator) wxDefaultValidator;
// a wxValidator parameter to avoid using "#if wxUSE_VALIDATORS" // a wxValidator parameter to avoid using "#if wxUSE_VALIDATORS"
// everywhere // everywhere
class WXDLLIMPEXP_FWD_CORE wxValidator; class WXDLLIMPEXP_FWD_CORE wxValidator;
#define wxDefaultValidator (*reinterpret_cast<wxValidator*>(NULL)) static const wxValidator* wxDefaultValidatorPtr = NULL;
#define wxDefaultValidator (*wxDefaultValidatorPtr)
// this macro allows to avoid warnings about unused parameters when // this macro allows to avoid warnings about unused parameters when
// wxUSE_VALIDATORS == 0 // wxUSE_VALIDATORS == 0