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

Avoid warnings when combining wxStaticText styles with C++20

Browse Source 
Because wxStaticText can contain arbitrary combinations of both
alignment and border flags, we need to allow using "|" on them, just as
it was done for a few other enums in 3d278ee75f (Avoid warnings about
operations on different enums in C++20 mode, 2021-04-25).

Closes #22656.

(cherry picked from commit 5477d4faa8d34db9b5d8b0b105e2ea550252edde)
This commit is contained in:
David Connet 2022-07-20 15:34:30 -07:00 committed by Vadim Zeitlin
parent 0ece687470
commit 34ab0ac7f0
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/changes.txt
View File

@ -238,6 +238,7 @@ Changes in behaviour which may result in build errors
All (GUI): All (GUI):
- Fix grid window scrollbars when freezing part of the grid (#22602). - Fix grid window scrollbars when freezing part of the grid (#22602).
- Avoid warnings with wxStaticText flags in C++20 (David Connet, #22656).
wxGTK: wxGTK:

1
include/wx/defs.h
View File

@ -1468,6 +1468,7 @@ enum wxBorder
wxALLOW_COMBINING_ENUMS(wxAlignment, wxDirection) wxALLOW_COMBINING_ENUMS(wxAlignment, wxDirection)
wxALLOW_COMBINING_ENUMS(wxAlignment, wxGeometryCentre) wxALLOW_COMBINING_ENUMS(wxAlignment, wxGeometryCentre)
wxALLOW_COMBINING_ENUMS(wxAlignment, wxStretch) wxALLOW_COMBINING_ENUMS(wxAlignment, wxStretch)
wxALLOW_COMBINING_ENUMS(wxAlignment, wxBorder)
wxALLOW_COMBINING_ENUMS(wxDirection, wxStretch) wxALLOW_COMBINING_ENUMS(wxDirection, wxStretch)
wxALLOW_COMBINING_ENUMS(wxDirection, wxGeometryCentre) wxALLOW_COMBINING_ENUMS(wxDirection, wxGeometryCentre)