Fix crash when editing wxDVC items in place in wxOSX/Cocoa.

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

diff --git a/include/wx/msgdlg.h b/include/wx/msgdlg.h
index 8e0e0a9bb74fb3d779e9bc79ca2700c65f2bf025..6d65fc75aaa1e9bda0a95b1caa73d11d94dcb772 100644 (file)
--- a/include/wx/msgdlg.h
+++ b/include/wx/msgdlg.h
@@ -68,8 +68,9 @@ public:
         // 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
@@ -158,7 +159,7 @@ public:
         wxASSERT_MSG( !(style & wxCANCEL_DEFAULT) || (style & wxCANCEL),
                       "wxCANCEL_DEFAULT is invalid without wxCANCEL" );
 
-        wxASSERT_MSG( !(style & wxCANCEL_DEFAULT) || !(style & wxNO),
+        wxASSERT_MSG( !(style & wxCANCEL_DEFAULT) || !(style & wxNO_DEFAULT),
                       "only one default button can be specified" );
 
         m_dialogStyle = style;