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

fix GCC warning "suggest explicit braces..."

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57780 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2009-01-02 18:10:10 +00:00
parent 365b8793d3
commit 41285bc82f
1 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
include/wx/msgdlg.h
View File

@@ -153,20 +153,14 @@ public:
wxASSERT_MSG( (style & wxID_OK) != wxID_OK, wxASSERT_MSG( (style & wxID_OK) != wxID_OK,
"wxMessageBox: Did you mean wxOK (and not wxID_OK)?" ); "wxMessageBox: Did you mean wxOK (and not wxID_OK)?" );
if ((style & wxNO) == 0) if ((style & wxNO_DEFAULT) != 0 && (style & wxNO) == 0)
wxASSERT_MSG( !(style & wxNO_DEFAULT), wxFAIL_MSG("wxNO_DEFAULT is invalid without wxNO");
"wxNO_DEFAULT is invalid without wxNO" );
if ((style & wxCANCEL) == 0) if ((style & wxCANCEL_DEFAULT) != 0 && (style & wxCANCEL) == 0)
wxASSERT_MSG( !(style & wxCANCEL_DEFAULT), wxFAIL_MSG("wxCANCEL_DEFAULT is invalid without wxCANCEL");
"wxCANCEL_DEFAULT is invalid without wxCANCEL" );
if ((style & wxCANCEL_DEFAULT) != 0) if ((style & wxCANCEL_DEFAULT) != 0 && (style & wxNO_DEFAULT) != 0)
wxASSERT_MSG( !(style & wxNO_DEFAULT), wxFAIL_MSG("only one default button can be specified");
"only one default button can be specified" );
if ((style & wxNO_DEFAULT) != 0)
wxASSERT_MSG( !(style & wxCANCEL_DEFAULT),
"only one default button can be specified" );
#endif #endif
m_dialogStyle = style; m_dialogStyle = style;