Updated wxvc_dll.dsp and memory.h to make VC++ compile in DLL mode again

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

diff --git a/src/msw/msgdlg.cpp b/src/msw/msgdlg.cpp
index f90d620808eb96791e0898abdefb4f728dbc08bd..70a83e908b93de17269f42ddb287d24e2ae7f09b 100644 (file)
--- a/src/msw/msgdlg.cpp
+++ b/src/msw/msgdlg.cpp
@@ -37,9 +37,7 @@
 #define wxDIALOG_DEFAULT_X 300
 #define wxDIALOG_DEFAULT_Y 300
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_CLASS(wxMessageDialog, wxDialog)
-#endif
 
 wxMessageDialog::wxMessageDialog(wxWindow *parent, const wxString& message, const wxString& caption,
         long style, const wxPoint& pos)
@@ -61,7 +59,11 @@ int wxMessageDialog::ShowModal(void)
       msStyle = MB_YESNOCANCEL;
     else
       msStyle = MB_YESNO;
+
+    if (m_dialogStyle & wxNO_DEFAULT)
+        msStyle |= MB_DEFBUTTON2;
   }
+
   if (m_dialogStyle & wxOK)
   {
     if (m_dialogStyle & wxCANCEL)
@@ -82,7 +84,7 @@ int wxMessageDialog::ShowModal(void)
     msStyle |= MB_APPLMODAL;
   else
     msStyle |= MB_TASKMODAL;
-    
+
   int msAns = MessageBox(hWnd, (LPCTSTR)(const wxChar *)m_message, (LPCTSTR)(const wxChar *)m_caption, msStyle);
   int ans = wxOK;
   switch (msAns)