fix GCC warning "suggest explicit braces..."
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57780 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
365b8793d3
commit
41285bc82f
1 changed files with 6 additions and 12 deletions
|
|
@ -153,20 +153,14 @@ public:
|
|||
wxASSERT_MSG( (style & wxID_OK) != wxID_OK,
|
||||
"wxMessageBox: Did you mean wxOK (and not wxID_OK)?" );
|
||||
|
||||
if ((style & wxNO) == 0)
|
||||
wxASSERT_MSG( !(style & wxNO_DEFAULT),
|
||||
"wxNO_DEFAULT is invalid without wxNO" );
|
||||
if ((style & wxNO_DEFAULT) != 0 && (style & wxNO) == 0)
|
||||
wxFAIL_MSG("wxNO_DEFAULT is invalid without wxNO");
|
||||
|
||||
if ((style & wxCANCEL) == 0)
|
||||
wxASSERT_MSG( !(style & wxCANCEL_DEFAULT),
|
||||
"wxCANCEL_DEFAULT is invalid without wxCANCEL" );
|
||||
if ((style & wxCANCEL_DEFAULT) != 0 && (style & wxCANCEL) == 0)
|
||||
wxFAIL_MSG("wxCANCEL_DEFAULT is invalid without wxCANCEL");
|
||||
|
||||
if ((style & wxCANCEL_DEFAULT) != 0)
|
||||
wxASSERT_MSG( !(style & wxNO_DEFAULT),
|
||||
"only one default button can be specified" );
|
||||
if ((style & wxNO_DEFAULT) != 0)
|
||||
wxASSERT_MSG( !(style & wxCANCEL_DEFAULT),
|
||||
"only one default button can be specified" );
|
||||
if ((style & wxCANCEL_DEFAULT) != 0 && (style & wxNO_DEFAULT) != 0)
|
||||
wxFAIL_MSG("only one default button can be specified");
|
||||
#endif
|
||||
|
||||
m_dialogStyle = style;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue