From a49a2e739035ad42c8a1d46e3a1c5204bae86437 Mon Sep 17 00:00:00 2001 From: Artur Wieczorek <7330332+a-wi@users.noreply.github.com> Date: Thu, 16 Jun 2022 13:53:15 +0200 Subject: [PATCH] Fix expression with different enum types Arithmetic conversions on operands of different enumeration types are deprecated in C++20 so we need to explicitly cast the operand to the compatible type. Closes #22505. --- include/wx/propgrid/propgridpagestate.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wx/propgrid/propgridpagestate.h b/include/wx/propgrid/propgridpagestate.h index c714f5a032..6c98b65f5c 100644 --- a/include/wx/propgrid/propgridpagestate.h +++ b/include/wx/propgrid/propgridpagestate.h @@ -125,7 +125,7 @@ wxPG_ITERATOR_MASK_OP_PARENT = wxPG_ITERATOR_FLAGS_ALL, // Combines all flags needed to iterate through visible properties // (ie. hidden properties and children of collapsed parents are skipped). -wxPG_ITERATE_VISIBLE = wxPG_ITERATE_PROPERTIES | +wxPG_ITERATE_VISIBLE = static_cast(wxPG_ITERATE_PROPERTIES) | wxPG_PROP_CATEGORY | wxPG_IT_CHILDREN(wxPG_PROP_AGGREGATE),