compilation fix for wxUSE_ON_FATAL_EXCEPTION == 0

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

diff --git a/src/msw/msgdlg.cpp b/src/msw/msgdlg.cpp
index 9468d768418744f33c6774e758b00b247c928dba..db900f66db178ab86c06f7503d9dcb3e7f8bd405 100644 (file)
--- a/src/msw/msgdlg.cpp
+++ b/src/msw/msgdlg.cpp
@@ -1,15 +1,15 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        msgdlg.cpp
+// Name:        src/msw/msgdlg.cpp

 // Purpose:     wxMessageDialog
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Purpose:     wxMessageDialog
 // Author:      Julian Smart
 // 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
 
 #pragma implementation "msgdlg.h"
 #endif
 


@@ -30,6 +30,11 @@
 
 #include "wx/msw/private.h"
 
 
 #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,
 IMPLEMENT_CLASS(wxMessageDialog, wxDialog)
 
 wxMessageDialog::wxMessageDialog(wxWindow *parent,


@@ -40,8 +45,8 @@ wxMessageDialog::wxMessageDialog(wxWindow *parent,
 {
     m_caption = caption;
     m_message = message;
 {
     m_caption = caption;
     m_message = message;

-    m_dialogStyle = style;

     m_parent = parent;
     m_parent = parent;

+    SetMessageDialogStyle(style);

 }
 
 int wxMessageDialog::ShowModal()
 }
 
 int wxMessageDialog::ShowModal()


@@ -56,46 +61,60 @@ int wxMessageDialog::ShowModal()
             wxTheApp->Dispatch();
     }
 
             wxTheApp->Dispatch();
     }
 

-    HWND hWnd = 0;
-    if (m_parent) hWnd = (HWND) m_parent->GetHWND();
+    // use the top level window as parent if none specified
+    if ( !m_parent )
+        m_parent = FindSuitableParent();
+    HWND hWnd = m_parent ? GetHwndOf(m_parent) : NULL;
+
+    // translate wx style in MSW

     unsigned int msStyle = MB_OK;
     unsigned int msStyle = MB_OK;

-    if (m_dialogStyle & wxYES_NO)
+    const long wxStyle = GetMessageDialogStyle();
+    if (wxStyle & wxYES_NO)

     {
     {

-        if (m_dialogStyle & wxCANCEL)
+#if !(defined(__SMARTPHONE__) && defined(__WXWINCE__))
+        if (wxStyle & wxCANCEL)

             msStyle = MB_YESNOCANCEL;
         else
             msStyle = MB_YESNOCANCEL;
         else

+#endif // !(__SMARTPHONE__ && __WXWINCE__)

             msStyle = MB_YESNO;
 
             msStyle = MB_YESNO;
 

-        if (m_dialogStyle & wxNO_DEFAULT)
+        if (wxStyle & wxNO_DEFAULT)

             msStyle |= MB_DEFBUTTON2;
     }
 
             msStyle |= MB_DEFBUTTON2;
     }
 

-    if (m_dialogStyle & wxOK)
+    if (wxStyle & wxOK)

     {
     {

-        if (m_dialogStyle & wxCANCEL)
+        if (wxStyle & wxCANCEL)

             msStyle = MB_OKCANCEL;
         else
             msStyle = MB_OK;
     }
             msStyle = MB_OKCANCEL;
         else
             msStyle = MB_OK;
     }

-    if (m_dialogStyle & wxICON_EXCLAMATION)
+    if (wxStyle & wxICON_EXCLAMATION)

         msStyle |= MB_ICONEXCLAMATION;
         msStyle |= MB_ICONEXCLAMATION;

-    else if (m_dialogStyle & wxICON_HAND)
+    else if (wxStyle & wxICON_HAND)

         msStyle |= MB_ICONHAND;
         msStyle |= MB_ICONHAND;

-    else if (m_dialogStyle & wxICON_INFORMATION)
+    else if (wxStyle & wxICON_INFORMATION)

         msStyle |= MB_ICONINFORMATION;
         msStyle |= MB_ICONINFORMATION;

-    else if (m_dialogStyle & wxICON_QUESTION)
+    else if (wxStyle & wxICON_QUESTION)

         msStyle |= MB_ICONQUESTION;
 
         msStyle |= MB_ICONQUESTION;
 

+    if ( wxStyle & wxSTAY_ON_TOP )
+        msStyle |= MB_TOPMOST;
+

     if (hWnd)
         msStyle |= MB_APPLMODAL;
     else
         msStyle |= MB_TASKMODAL;
 
     if (hWnd)
         msStyle |= MB_APPLMODAL;
     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)
     {
     switch (msAns)
     {

+        default:
+            wxFAIL_MSG(_T("unexpected ::MessageBox() return code"));
+            // fall through
+

         case IDCANCEL:
             ans = wxID_CANCEL;
             break;
         case IDCANCEL:
             ans = wxID_CANCEL;
             break;