X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0d7ea902499bf302628cc12aa4705fb162b6fefd..f538710f0b798b21365fd614ba531055b225b115:/src/msw/msgdlg.cpp

diff --git a/src/msw/msgdlg.cpp b/src/msw/msgdlg.cpp
index 13e93e18c1..ec05f72a37 100644
--- a/src/msw/msgdlg.cpp
+++ b/src/msw/msgdlg.cpp
@@ -21,6 +21,7 @@
 #endif
 
 #ifndef WX_PRECOMP
+    #include "wx/app.h"
     #include "wx/defs.h"
     #include "wx/utils.h"
     #include "wx/dialog.h"
@@ -45,7 +46,8 @@ wxMessageDialog::wxMessageDialog(wxWindow *parent,
 
 int wxMessageDialog::ShowModal()
 {
-    if ( !wxTheApp->GetTopWindow() )
+    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
@@ -55,8 +57,14 @@ int wxMessageDialog::ShowModal()
             wxTheApp->Dispatch();
     }
 
+    // use the top level window as parent if none specified
     HWND hWnd = 0;
-    if (m_parent) hWnd = (HWND) m_parent->GetHWND();
+    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)
     {
@@ -90,11 +98,15 @@ int wxMessageDialog::ShowModal()
     else
         msStyle |= MB_TASKMODAL;
 
-    int msAns = MessageBox(hWnd, (LPCTSTR)m_message.c_str(),
-                           (LPCTSTR)m_caption.c_str(), msStyle);
-    int ans = wxOK;
+    // 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;