don't draw borders for bitmap buttons with wxBORDER_NONE style

[wxWidgets.git] / include / wx / msgdlg.h

diff --git a/include/wx/msgdlg.h b/include/wx/msgdlg.h
index 7c4329fa39c33755b9c16173932968fee44ad9c2..3e52b9c68dd4084def1d0f0b75072025e8743ee2 100644 (file)
--- a/include/wx/msgdlg.h
+++ b/include/wx/msgdlg.h
@@ -140,7 +140,6 @@ public:
     // change the dialog style flag
     void SetMessageDialogStyle(long style)
     {
     // change the dialog style flag
     void SetMessageDialogStyle(long style)
     {

-#ifdef __WXDEBUG__

         wxASSERT_MSG( ((style & wxYES_NO) == wxYES_NO) || !(style & wxYES_NO),
                       "wxYES and wxNO may only be used together" );
 
         wxASSERT_MSG( ((style & wxYES_NO) == wxYES_NO) || !(style & wxYES_NO),
                       "wxYES and wxNO may only be used together" );
 


@@ -153,15 +152,14 @@ public:
         wxASSERT_MSG( (style & wxID_OK) != wxID_OK,
                       "wxMessageBox: Did you mean wxOK (and not wxID_OK)?" );
 
         wxASSERT_MSG( (style & wxID_OK) != wxID_OK,
                       "wxMessageBox: Did you mean wxOK (and not wxID_OK)?" );
 

-        if ((style & wxNO_DEFAULT) != 0 && (style & wxNO) == 0)
-            wxFAIL_MSG("wxNO_DEFAULT is invalid without wxNO");
+        wxASSERT_MSG( !(style & wxNO_DEFAULT) || (style & wxNO),
+                      "wxNO_DEFAULT is invalid without wxNO" );

 
 

-        if ((style & wxCANCEL_DEFAULT) != 0 && (style & wxCANCEL) == 0)
-            wxFAIL_MSG("wxCANCEL_DEFAULT is invalid without wxCANCEL");
+        wxASSERT_MSG( !(style & wxCANCEL_DEFAULT) || (style & wxCANCEL),
+                      "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
+        wxASSERT_MSG( !(style & wxCANCEL_DEFAULT) || !(style & wxNO_DEFAULT),
+                      "only one default button can be specified" );

 
         m_dialogStyle = style;
     }
 
         m_dialogStyle = style;
     }