reset m_selectionOld when the selection is programatically changed

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

diff --git a/src/msw/msgdlg.cpp b/src/msw/msgdlg.cpp
index 3b5517b828914592bdb5f51821ca7a27743cb323..5e94f0ebd7fed00815a49ab8e2e1107c9d6dc5b6 100644 (file)
--- a/src/msw/msgdlg.cpp
+++ b/src/msw/msgdlg.cpp
@@ -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,
@@ -74,9 +79,11 @@ int wxMessageDialog::ShowModal()
     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)
@@ -104,10 +111,8 @@ int wxMessageDialog::ShowModal()
 
     if (hWnd)
         msStyle |= MB_APPLMODAL;
-#ifndef __WXWINCE__
     else
         msStyle |= MB_TASKMODAL;
-#endif
 
     // do show the dialog
     int msAns = MessageBox(hWnd, m_message.c_str(), m_caption.c_str(), msStyle);