X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/837e57436a89516a5fa9f478f401e06bd872c17c..b40b0f5b204d59bbc1d3e66c5bba192b878469a6:/src/msw/msgdlg.cpp?ds=sidebyside diff --git a/src/msw/msgdlg.cpp b/src/msw/msgdlg.cpp index f90d620808..70a83e908b 100644 --- a/src/msw/msgdlg.cpp +++ b/src/msw/msgdlg.cpp @@ -37,9 +37,7 @@ #define wxDIALOG_DEFAULT_X 300 #define wxDIALOG_DEFAULT_Y 300 -#if !USE_SHARED_LIBRARY IMPLEMENT_CLASS(wxMessageDialog, wxDialog) -#endif wxMessageDialog::wxMessageDialog(wxWindow *parent, const wxString& message, const wxString& caption, long style, const wxPoint& pos) @@ -61,7 +59,11 @@ int wxMessageDialog::ShowModal(void) msStyle = MB_YESNOCANCEL; else msStyle = MB_YESNO; + + if (m_dialogStyle & wxNO_DEFAULT) + msStyle |= MB_DEFBUTTON2; } + if (m_dialogStyle & wxOK) { if (m_dialogStyle & wxCANCEL) @@ -82,7 +84,7 @@ int wxMessageDialog::ShowModal(void) msStyle |= MB_APPLMODAL; else msStyle |= MB_TASKMODAL; - + int msAns = MessageBox(hWnd, (LPCTSTR)(const wxChar *)m_message, (LPCTSTR)(const wxChar *)m_caption, msStyle); int ans = wxOK; switch (msAns)