X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5bc4758090e3a725bf5b29ff89c49d6f77eebf04..058f225a44d83d42ba9d773efc705badbf0e5e3c:/include/wx/msgdlg.h?ds=sidebyside

diff --git a/include/wx/msgdlg.h b/include/wx/msgdlg.h
index 7c372cff6f..8645691499 100644
--- a/include/wx/msgdlg.h
+++ b/include/wx/msgdlg.h
@@ -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 & wxCANCEL) == 0)
-            wxASSERT_MSG( !(style & wxCANCEL_DEFAULT),
-                          "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 & wxNO_DEFAULT) != 0 && (style & wxNO) == 0)
+            wxFAIL_MSG("wxNO_DEFAULT is invalid without wxNO");
+
+        if ((style & wxCANCEL_DEFAULT) != 0 && (style & wxCANCEL) == 0)
+            wxFAIL_MSG("wxCANCEL_DEFAULT is invalid without wxCANCEL");
+
+        if ((style & wxCANCEL_DEFAULT) != 0 && (style & wxNO_DEFAULT) != 0)
+            wxFAIL_MSG("only one default button can be specified");
 #endif
 
         m_dialogStyle = style;