X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6c9a19aabab3a878b565e6c2a5f2a3824277c4dc..bcb8ba61c374af7570611514e1d5b3f961ae7559:/src/msw/msgdlg.cpp?ds=inline

diff --git a/src/msw/msgdlg.cpp b/src/msw/msgdlg.cpp
index aa45cb9181..db900f66db 100644
--- a/src/msw/msgdlg.cpp
+++ b/src/msw/msgdlg.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        msgdlg.cpp
+// Name:        src/msw/msgdlg.cpp
 // Purpose:     wxMessageDialog
 // Author:      Julian Smart
 // Modified by:
@@ -9,7 +9,7 @@
 // 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,
@@ -40,8 +45,8 @@ wxMessageDialog::wxMessageDialog(wxWindow *parent,
 {
     m_caption = caption;
     m_message = message;
-    m_dialogStyle = style;
     m_parent = parent;
+    SetMessageDialogStyle(style);
 }
 
 int wxMessageDialog::ShowModal()
@@ -63,34 +68,37 @@ int wxMessageDialog::ShowModal()
 
     // translate wx style in MSW
     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
+#endif // !(__SMARTPHONE__ && __WXWINCE__)
             msStyle = MB_YESNO;
 
-        if (m_dialogStyle & wxNO_DEFAULT)
+        if (wxStyle & wxNO_DEFAULT)
             msStyle |= MB_DEFBUTTON2;
     }
 
-    if (m_dialogStyle & wxOK)
+    if (wxStyle & wxOK)
     {
-        if (m_dialogStyle & wxCANCEL)
+        if (wxStyle & wxCANCEL)
             msStyle = MB_OKCANCEL;
         else
             msStyle = MB_OK;
     }
-    if (m_dialogStyle & wxICON_EXCLAMATION)
+    if (wxStyle & wxICON_EXCLAMATION)
         msStyle |= MB_ICONEXCLAMATION;
-    else if (m_dialogStyle & wxICON_HAND)
+    else if (wxStyle & wxICON_HAND)
         msStyle |= MB_ICONHAND;
-    else if (m_dialogStyle & wxICON_INFORMATION)
+    else if (wxStyle & wxICON_INFORMATION)
         msStyle |= MB_ICONINFORMATION;
-    else if (m_dialogStyle & wxICON_QUESTION)
+    else if (wxStyle & wxICON_QUESTION)
         msStyle |= MB_ICONQUESTION;
 
-    if ( m_dialogStyle & wxSTAY_ON_TOP )
+    if ( wxStyle & wxSTAY_ON_TOP )
         msStyle |= MB_TOPMOST;
 
     if (hWnd)