X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9053c7b9c158d15c33f7b61f4fc082f85cb4b41f..92153555cf08cc818d6f4becfc1576d9c2add023:/include/wx/msgdlg.h diff --git a/include/wx/msgdlg.h b/include/wx/msgdlg.h index 8e0e0a9bb7..6d65fc75aa 100644 --- 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;