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

Add ASSERT_NO_IGNORED_FLAGS() macro and use it in wxBoxSizer code

Browse Source 
No real changes, just refactor the asserts a bit before the upcoming
changes and also try to make the messages more clear and useful.
This commit is contained in:
Vadim Zeitlin
2021-05-19 19:14:57 +01:00
parent a352dee1f1
commit 405cfe7f32
1 changed files with 33 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
src/common/sizer.cpp
View File

@@ -146,6 +146,13 @@ static const int SIZER_FLAGS_MASK =
#endif // wxDEBUG_LEVEL #endif // wxDEBUG_LEVEL
#define ASSERT_NO_IGNORED_FLAGS_IMPL(f, value, name, explanation) \
wxASSERT_MSG( !((f) & (value)), \
name " will be ignored in this sizer: " explanation )
#define ASSERT_NO_IGNORED_FLAGS(f, flags, explanation) \
ASSERT_NO_IGNORED_FLAGS_IMPL(f, flags, #flags, explanation)
#define ASSERT_INCOMPATIBLE_NOT_USED_IMPL(f, f1, n1, f2, n2) \ #define ASSERT_INCOMPATIBLE_NOT_USED_IMPL(f, f1, n1, f2, n2) \
wxASSERT_MSG(((f) & (f1 | f2)) != (f1 | f2), \ wxASSERT_MSG(((f) & (f1 | f2)) != (f1 | f2), \
n1 " and " n2 " can't be used together") n1 " and " n2 " can't be used together")
@@ -1473,7 +1480,7 @@ wxSizerItem *wxGridSizer::DoInsert(size_t index, wxSizerItem *item)
( (
!(flags & (wxALIGN_BOTTOM | wxALIGN_CENTRE_VERTICAL)) || !(flags & (wxALIGN_BOTTOM | wxALIGN_CENTRE_VERTICAL)) ||
!(flags & (wxALIGN_RIGHT | wxALIGN_CENTRE_HORIZONTAL)), !(flags & (wxALIGN_RIGHT | wxALIGN_CENTRE_HORIZONTAL)),
wxS("wxEXPAND flag will be overridden by alignment flags") "wxEXPAND flag will be overridden by alignment flags"
); );
} }
@@ -2083,10 +2090,10 @@ wxSizerItem *wxBoxSizer::DoInsert(size_t index, wxSizerItem *item)
const int flags = item->GetFlag(); const int flags = item->GetFlag();
if ( IsVertical() ) if ( IsVertical() )
{ {
wxASSERT_MSG ASSERT_NO_IGNORED_FLAGS
( (
!(flags & wxALIGN_BOTTOM), flags, wxALIGN_BOTTOM,
wxS("Vertical alignment flags are ignored in vertical sizers") "only horizontal alignment flags can be used in vertical sizers"
); );
// We need to accept wxALIGN_CENTRE_VERTICAL when it is combined with // We need to accept wxALIGN_CENTRE_VERTICAL when it is combined with
@@ -2094,49 +2101,43 @@ wxSizerItem *wxBoxSizer::DoInsert(size_t index, wxSizerItem *item)
// and we accept it historically in wxSizer API. // and we accept it historically in wxSizer API.
if ( !(flags & wxALIGN_CENTRE_HORIZONTAL) ) if ( !(flags & wxALIGN_CENTRE_HORIZONTAL) )
{ {
wxASSERT_MSG ASSERT_NO_IGNORED_FLAGS
( (
!(flags & wxALIGN_CENTRE_VERTICAL), flags, wxALIGN_CENTRE_VERTICAL,
wxS("Vertical alignment flags are ignored in vertical sizers") "only horizontal alignment flags can be used in vertical sizers"
);
}
// Note that using alignment with wxEXPAND can make sense if wxSHAPED
// is also used, as the item doesn't necessarily fully expand in the
// other direction in this case.
if ( (flags & wxEXPAND) && !(flags & wxSHAPED) )
{
wxASSERT_MSG
(
!(flags & (wxALIGN_RIGHT | wxALIGN_CENTRE_HORIZONTAL)),
wxS("Horizontal alignment flags are ignored with wxEXPAND")
); );
} }
} }
else // horizontal else // horizontal
{ {
wxASSERT_MSG ASSERT_NO_IGNORED_FLAGS
( (
!(flags & wxALIGN_RIGHT), flags, wxALIGN_RIGHT,
wxS("Horizontal alignment flags are ignored in horizontal sizers") "only vertical alignment flags can be used in horizontal sizers"
); );
if ( !(flags & wxALIGN_CENTRE_VERTICAL) ) if ( !(flags & wxALIGN_CENTRE_VERTICAL) )
{ {
wxASSERT_MSG ASSERT_NO_IGNORED_FLAGS
( (
!(flags & wxALIGN_CENTRE_HORIZONTAL), flags, wxALIGN_CENTRE_HORIZONTAL,
wxS("Horizontal alignment flags are ignored in horizontal sizers") "only vertical alignment flags can be used in horizontal sizers"
); );
} }
}
if ( (flags & wxEXPAND) && !(flags & wxSHAPED) ) // Note that using alignment with wxEXPAND can make sense if wxSHAPED
{ // is also used, as the item doesn't necessarily fully expand in the
wxASSERT_MSG( // other direction in this case.
!(flags & (wxALIGN_BOTTOM | wxALIGN_CENTRE_VERTICAL)), if ( (flags & wxEXPAND) && !(flags & wxSHAPED) )
wxS("Vertical alignment flags are ignored with wxEXPAND") {
); ASSERT_NO_IGNORED_FLAGS
} (
flags,
wxALIGN_RIGHT | wxALIGN_CENTRE_HORIZONTAL |
wxALIGN_BOTTOM | wxALIGN_CENTRE_VERTICAL,
"wxEXPAND overrides alignment flags in box sizers"
);
} }
return wxSizer::DoInsert(index, item); return wxSizer::DoInsert(index, item);