fix wxOS2 build where OpenGL headers are available but there's no wxGlCanvas implemen...

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

diff --git a/include/wx/msgdlg.h b/include/wx/msgdlg.h
index 80644941ff9d8828b8ae8dfac8bfefb8d62b9a99..7c372cff6fd35a06c88bcdf173ce1ec96460c35a 100644 (file)
--- a/include/wx/msgdlg.h
+++ b/include/wx/msgdlg.h
@@ -46,6 +46,21 @@ public:
         {
         }
 
         {
         }
 

+        ButtonLabel(const char *label)
+            : m_label(label), m_stockId(wxID_NONE)
+        {
+        }
+
+        ButtonLabel(const wchar_t *label)
+            : m_label(label), m_stockId(wxID_NONE)
+        {
+        }
+
+        ButtonLabel(const wxCStrData& label)
+            : m_label(label), m_stockId(wxID_NONE)
+        {
+        }
+

         // default copy ctor and dtor are ok
 
         // get the string label, whether it was originally specified directly
         // default copy ctor and dtor are ok
 
         // get the string label, whether it was originally specified directly


@@ -122,19 +137,42 @@ public:
         m_extendedMessage = extendedMessage;
     }
 
         m_extendedMessage = extendedMessage;
     }
 

-protected:
-    // common validation of wxMessageDialog style
+    // change the dialog style flag

     void SetMessageDialogStyle(long style)
     {
     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" );
 

+        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)?" );
 
         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" );
+#endif
+

         m_dialogStyle = style;
     }
 
         m_dialogStyle = style;
     }
 

+protected:

     long GetMessageDialogStyle() const { return m_dialogStyle; }
 
 
     long GetMessageDialogStyle() const { return m_dialogStyle; }