X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b8505921fcf3328fa86d79828a74fc46d62d438d..164f091f4bb7bfd23c1f7af516327207c2193482:/src/msw/msgdlg.cpp

diff --git a/src/msw/msgdlg.cpp b/src/msw/msgdlg.cpp
index ec05f72a37..5e94f0ebd7 100644
--- a/src/msw/msgdlg.cpp
+++ b/src/msw/msgdlg.cpp
@@ -5,11 +5,11 @@
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:     wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "msgdlg.h"
 #endif
 
@@ -30,6 +30,11 @@
 
 #include "wx/msw/private.h"
 
+// For MB_TASKMODAL
+#ifdef __WXWINCE__
+#include "wx/msw/wince/missing.h"
+#endif
+
 IMPLEMENT_CLASS(wxMessageDialog, wxDialog)
 
 wxMessageDialog::wxMessageDialog(wxWindow *parent,
@@ -38,6 +43,15 @@ wxMessageDialog::wxMessageDialog(wxWindow *parent,
                                  long style,
                                  const wxPoint& WXUNUSED(pos))
 {
+#ifdef __WXDEBUG__
+    // check for common programming errors
+    if ( (style & wxID_OK) == wxID_OK )
+    {
+        // programmer probably confused wxID_OK with wxOK. Correct one is wxOK.
+        wxFAIL_MSG( _T("wxMessageBox: Did you mean wxOK (and not wxID_OK)?") );
+    }
+#endif // __WXDEBUG__
+
     m_caption = caption;
     m_message = message;
     m_dialogStyle = style;
@@ -46,8 +60,7 @@ wxMessageDialog::wxMessageDialog(wxWindow *parent,
 
 int wxMessageDialog::ShowModal()
 {
-    wxWindow *winTop = wxTheApp->GetTopWindow();
-    if ( !winTop )
+    if ( !wxTheApp->GetTopWindow() )
     {
         // 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
@@ -58,19 +71,19 @@ int wxMessageDialog::ShowModal()
     }
 
     // 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);
+    if ( !m_parent )
+        m_parent = FindSuitableParent();
+    HWND hWnd = m_parent ? GetHwndOf(m_parent) : NULL;
 
     // translate wx style in MSW
     unsigned int msStyle = MB_OK;
     if (m_dialogStyle & wxYES_NO)
     {
+#if !(defined(__SMARTPHONE__) && defined(__WXWINCE__))
         if (m_dialogStyle & wxCANCEL)
             msStyle = MB_YESNOCANCEL;
         else
+#endif // !(__SMARTPHONE__ && __WXWINCE__)
             msStyle = MB_YESNO;
 
         if (m_dialogStyle & wxNO_DEFAULT)
@@ -93,6 +106,9 @@ int wxMessageDialog::ShowModal()
     else if (m_dialogStyle & wxICON_QUESTION)
         msStyle |= MB_ICONQUESTION;
 
+    if ( m_dialogStyle & wxSTAY_ON_TOP )
+        msStyle |= MB_TOPMOST;
+
     if (hWnd)
         msStyle |= MB_APPLMODAL;
     else