(hopefully) workaround for a carbon bug not always setting the modifiers event record...

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

diff --git a/src/msw/msgdlg.cpp b/src/msw/msgdlg.cpp
index a3f4628ae1d358e8df20e82da04620eec7661294..834fbdb022943388947b4915608c1e6c812a4b46 100644 (file)
--- a/src/msw/msgdlg.cpp
+++ b/src/msw/msgdlg.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:    wxWindows license
+// Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -21,28 +21,22 @@
 #endif
 
 #ifndef WX_PRECOMP
-#include <stdio.h>
-#include "wx/defs.h"
-#include "wx/utils.h"
-#include "wx/dialog.h"
-#include "wx/msgdlg.h"
+    #include "wx/app.h"
+    #include "wx/defs.h"
+    #include "wx/utils.h"
+    #include "wx/dialog.h"
+    #include "wx/msgdlg.h"
 #endif
 
 #include "wx/msw/private.h"
 
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
-
-#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)
+wxMessageDialog::wxMessageDialog(wxWindow *parent,
+                                 const wxString& message,
+                                 const wxString& caption,
+                                 long style,
+                                 const wxPoint& WXUNUSED(pos))
 {
     m_caption = caption;
     m_message = message;
@@ -50,89 +44,85 @@ wxMessageDialog::wxMessageDialog(wxWindow *parent, const wxString& message, cons
     m_parent = parent;
 }
 
-int wxMessageDialog::ShowModal(void)
+int wxMessageDialog::ShowModal()
 {
-  HWND hWnd = 0;
-  if (m_parent) hWnd = (HWND) m_parent->GetHWND();
-  unsigned int msStyle = MB_OK;
-  if (m_dialogStyle & wxYES_NO)
-  {
-    if (m_dialogStyle & wxCANCEL)
-      msStyle = MB_YESNOCANCEL;
-    else
-      msStyle = MB_YESNO;
-  }
-  if (m_dialogStyle & wxOK)
-  {
-    if (m_dialogStyle & wxCANCEL)
-      msStyle = MB_OKCANCEL;
+    wxWindow *winTop = wxTheApp->GetTopWindow();
+    if ( !winTop )
+    {
+        // when the message box is shown from wxApp::OnInit() (i.e. before the
+        // message loop is entered), this must be done or the next message box
+        // will never be shown - just try putting 2 calls to wxMessageBox() in
+        // OnInit() to see it
+        while ( wxTheApp->Pending() )
+            wxTheApp->Dispatch();
+    }
+
+    // use the top level window as parent if none specified
+    HWND hWnd = 0;
+    if ( m_parent )
+        hWnd = GetHwndOf(m_parent);
+    else if ( winTop )
+        hWnd = GetHwndOf(winTop);
+
+    // translate wx style in MSW
+    unsigned int msStyle = MB_OK;
+    if (m_dialogStyle & wxYES_NO)
+    {
+        if (m_dialogStyle & wxCANCEL)
+            msStyle = MB_YESNOCANCEL;
+        else
+            msStyle = MB_YESNO;
+
+        if (m_dialogStyle & wxNO_DEFAULT)
+            msStyle |= MB_DEFBUTTON2;
+    }
+
+    if (m_dialogStyle & wxOK)
+    {
+        if (m_dialogStyle & wxCANCEL)
+            msStyle = MB_OKCANCEL;
+        else
+            msStyle = MB_OK;
+    }
+    if (m_dialogStyle & wxICON_EXCLAMATION)
+        msStyle |= MB_ICONEXCLAMATION;
+    else if (m_dialogStyle & wxICON_HAND)
+        msStyle |= MB_ICONHAND;
+    else if (m_dialogStyle & wxICON_INFORMATION)
+        msStyle |= MB_ICONINFORMATION;
+    else if (m_dialogStyle & wxICON_QUESTION)
+        msStyle |= MB_ICONQUESTION;
+
+    if ( m_dialogStyle & wxSTAY_ON_TOP )
+        msStyle |= MB_TOPMOST;
+
+    if (hWnd)
+        msStyle |= MB_APPLMODAL;
     else
-      msStyle = MB_OK;
-  }
-  if (m_dialogStyle & wxICON_EXCLAMATION)
-    msStyle |= MB_ICONEXCLAMATION;
-  else if (m_dialogStyle & wxICON_HAND)
-    msStyle |= MB_ICONHAND;
-  else if (m_dialogStyle & wxICON_INFORMATION)
-    msStyle |= MB_ICONINFORMATION;
-  else if (m_dialogStyle & wxICON_QUESTION)
-    msStyle |= MB_ICONQUESTION;
-
-  if (hWnd)
-    msStyle |= MB_APPLMODAL;
-  else
-    msStyle |= MB_TASKMODAL;
-    
-  int msAns = MessageBox(hWnd, (LPCSTR)(const char *)m_message, (LPCSTR)(const char *)m_caption, msStyle);
-  int ans = wxOK;
-  switch (msAns)
-  {
-    case IDCANCEL:
-      ans = wxID_CANCEL;
-      break;
-    case IDOK:
-      ans = wxID_OK;
-      break;
-    case IDYES:
-      ans = wxID_YES;
-      break;
-    case IDNO:
-      ans = wxID_NO;
-      break;
-  }
-  return ans;
+        msStyle |= MB_TASKMODAL;
+
+    // do show the dialog
+    int msAns = MessageBox(hWnd, m_message.c_str(), m_caption.c_str(), msStyle);
+    int ans;
+    switch (msAns)
+    {
+        default:
+            wxFAIL_MSG(_T("unexpected ::MessageBox() return code"));
+            // fall through
+
+        case IDCANCEL:
+            ans = wxID_CANCEL;
+            break;
+        case IDOK:
+            ans = wxID_OK;
+            break;
+        case IDYES:
+            ans = wxID_YES;
+            break;
+        case IDNO:
+            ans = wxID_NO;
+            break;
+    }
+    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;
-}
-
-