made definition of wxUSE_LOG_DEBUG dependent on wxDEBUG_LEVEL and added wxUSE_LOG_TRA...

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

diff --git a/include/wx/msgdlg.h b/include/wx/msgdlg.h
index 7dbffe33a3e4855c6096e51f106f136cd9b8a20a..4d822d3dc068d5f23eb4098e12699425e698007f 100644 (file)
--- a/include/wx/msgdlg.h
+++ b/include/wx/msgdlg.h
@@ -143,9 +143,24 @@ public:
         wxASSERT_MSG( ((style & wxYES_NO) == wxYES_NO) || !(style & wxYES_NO),
                       "wxYES and wxNO may only be used together" );
 
+        wxASSERT_MSG( !(style & wxYES) || !(style & wxOK),
+                      "wxOK and wxYES/wxNO can't be used together" );
+
+        wxASSERT_MSG( (style & wxYES) || (style & wxOK),
+                      "one of wxOK and wxYES/wxNO must be used" );
+
         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");
+
+        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");
+
         m_dialogStyle = style;
     }
 
@@ -169,7 +184,7 @@ protected:
              m_caption;
     long m_dialogStyle;
 
-    DECLARE_NO_COPY_CLASS(wxMessageDialogBase)
+    wxDECLARE_NO_COPY_CLASS(wxMessageDialogBase);
 };
 
 // this is a helper class for native wxMessageDialog implementations which need
@@ -273,7 +288,7 @@ private:
              m_ok,
              m_cancel;
 
-    DECLARE_NO_COPY_CLASS(wxMessageDialogWithCustomLabels)
+    wxDECLARE_NO_COPY_CLASS(wxMessageDialogWithCustomLabels);
 };
 
 #endif // ports needing wxMessageDialogWithCustomLabels