Makefile updates from new filelist.txt

[wxWidgets.git] / src / msw / msgdlg.cpp

diff --git a/src/msw/msgdlg.cpp b/src/msw/msgdlg.cpp
index a3f4628ae1d358e8df20e82da04620eec7661294..77bf94c6b9e9b54392f3ad764b129af97235e426 100644 (file)
--- a/src/msw/msgdlg.cpp
+++ b/src/msw/msgdlg.cpp
@@ -61,7 +61,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,8 +86,8 @@ int wxMessageDialog::ShowModal(void)
     msStyle |= MB_APPLMODAL;
   else
     msStyle |= MB_TASKMODAL;
-    
-  int msAns = MessageBox(hWnd, (LPCSTR)(const char *)m_message, (LPCSTR)(const char *)m_caption, msStyle);
+
+  int msAns = MessageBox(hWnd, (LPCTSTR)(const wxChar *)m_message, (LPCTSTR)(const wxChar *)m_caption, msStyle);
   int ans = wxOK;
   switch (msAns)
   {
@@ -103,36 +107,3 @@ int wxMessageDialog::ShowModal(void)
   return ans;
 }
 
-/*
- * Common dialogs
- *
- */
- 
-// Pop up a message box
-int wxMessageBox(const wxString& message, const wxString& caption, const long style,
-                 wxWindow *parent, const int x, const int y)
-{
-       wxMessageDialog dialog(parent, message, caption, style);
-
-       int ans = dialog.ShowModal();
-       switch ( ans )
-       {
-               case wxID_OK:
-                       return wxOK;
-                       break;
-               case wxID_YES:
-                       return wxYES;
-                       break;
-               case wxID_NO:
-                       return wxNO;
-                       break;
-               default:
-               case wxID_CANCEL:
-                       return wxCANCEL;
-                       break;
-       }
-
-       return ans;
-}
-
-