avoid causing idle event from GetValue(), fixes #11013

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

diff --git a/include/wx/msgdlg.h b/include/wx/msgdlg.h
index 80644941ff9d8828b8ae8dfac8bfefb8d62b9a99..6d65fc75aaa1e9bda0a95b1caa73d11d94dcb772 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


@@ -53,8 +68,9 @@ public:
         // stock items id support
         wxString GetAsString() const
         {
         // stock items id support
         wxString GetAsString() const
         {

-            return m_stockId == wxID_NONE ? m_label
-                                          : wxGetStockLabel(m_stockId);
+            return m_stockId == wxID_NONE
+                    ? m_label
+                    : wxGetStockLabel(m_stockId, wxSTOCK_FOR_BUTTON);

         }
 
         // return the stock id or wxID_NONE if this is not a stock label
         }
 
         // return the stock id or wxID_NONE if this is not a stock label


@@ -122,19 +138,34 @@ public:
         m_extendedMessage = extendedMessage;
     }
 
         m_extendedMessage = extendedMessage;
     }
 

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

     void SetMessageDialogStyle(long style)
     {
         wxASSERT_MSG( ((style & wxYES_NO) == wxYES_NO) || !(style & wxYES_NO),
                       "wxYES and wxNO may only be used together" );
 
     void SetMessageDialogStyle(long style)
     {
         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)?" );
 

+        wxASSERT_MSG( !(style & wxNO_DEFAULT) || (style & wxNO),
+                      "wxNO_DEFAULT is invalid without wxNO" );
+
+        wxASSERT_MSG( !(style & wxCANCEL_DEFAULT) || (style & wxCANCEL),
+                      "wxCANCEL_DEFAULT is invalid without wxCANCEL" );
+
+        wxASSERT_MSG( !(style & wxCANCEL_DEFAULT) || !(style & wxNO_DEFAULT),
+                      "only one default button can be specified" );
+

         m_dialogStyle = style;
     }
 
         m_dialogStyle = style;
     }
 

+protected:

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


@@ -154,7 +185,7 @@ protected:
              m_caption;
     long m_dialogStyle;
 
              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
 };
 
 // this is a helper class for native wxMessageDialog implementations which need


@@ -258,7 +289,7 @@ private:
              m_ok,
              m_cancel;
 
              m_ok,
              m_cancel;
 

-    DECLARE_NO_COPY_CLASS(wxMessageDialogWithCustomLabels)
+    wxDECLARE_NO_COPY_CLASS(wxMessageDialogWithCustomLabels);

 };
 
 #endif // ports needing wxMessageDialogWithCustomLabels
 };
 
 #endif // ports needing wxMessageDialogWithCustomLabels