fixes in cleanup of DDE servers: don't delete them ourseleves (this is inconsistent...

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

diff --git a/src/msw/msgdlg.cpp b/src/msw/msgdlg.cpp
index f90d620808eb96791e0898abdefb4f728dbc08bd..c51438155da7b62f164d942eaa945057683be498 100644 (file)
--- 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
 
@@ -21,85 +21,116 @@
 #endif
 
 #ifndef WX_PRECOMP
-#include <stdio.h>
-#include "wx/defs.h"
-#include "wx/utils.h"
-#include "wx/dialog.h"
-#include "wx/msgdlg.h"
+    #include "wx/app.h"
+    #include "wx/defs.h"
+    #include "wx/utils.h"
+    #include "wx/dialog.h"
+    #include "wx/msgdlg.h"
 #endif
 
 #include "wx/msw/private.h"
 
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
-
-#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)
+wxMessageDialog::wxMessageDialog(wxWindow *parent,
+                                 const wxString& message,
+                                 const wxString& caption,
+                                 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;
     m_parent = parent;
 }
 
-int wxMessageDialog::ShowModal(void)
+int wxMessageDialog::ShowModal()
 {
-  HWND hWnd = 0;
-  if (m_parent) hWnd = (HWND) m_parent->GetHWND();
-  unsigned int msStyle = MB_OK;
-  if (m_dialogStyle & wxYES_NO)
-  {
-    if (m_dialogStyle & wxCANCEL)
-      msStyle = MB_YESNOCANCEL;
-    else
-      msStyle = MB_YESNO;
-  }
-  if (m_dialogStyle & wxOK)
-  {
-    if (m_dialogStyle & wxCANCEL)
-      msStyle = MB_OKCANCEL;
+    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
+        // will never be shown - just try putting 2 calls to wxMessageBox() in
+        // OnInit() to see it
+        while ( wxTheApp->Pending() )
+            wxTheApp->Dispatch();
+    }
+
+    // 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;
+    if (m_dialogStyle & wxYES_NO)
+    {
+        if (m_dialogStyle & wxCANCEL)
+            msStyle = MB_YESNOCANCEL;
+        else
+            msStyle = MB_YESNO;
+
+        if (m_dialogStyle & wxNO_DEFAULT)
+            msStyle |= MB_DEFBUTTON2;
+    }
+
+    if (m_dialogStyle & wxOK)
+    {
+        if (m_dialogStyle & wxCANCEL)
+            msStyle = MB_OKCANCEL;
+        else
+            msStyle = MB_OK;
+    }
+    if (m_dialogStyle & wxICON_EXCLAMATION)
+        msStyle |= MB_ICONEXCLAMATION;
+    else if (m_dialogStyle & wxICON_HAND)
+        msStyle |= MB_ICONHAND;
+    else if (m_dialogStyle & wxICON_INFORMATION)
+        msStyle |= MB_ICONINFORMATION;
+    else if (m_dialogStyle & wxICON_QUESTION)
+        msStyle |= MB_ICONQUESTION;
+
+    if ( m_dialogStyle & wxSTAY_ON_TOP )
+        msStyle |= MB_TOPMOST;
+
+    if (hWnd)
+        msStyle |= MB_APPLMODAL;
+#ifndef __WXWINCE__
     else
-      msStyle = MB_OK;
-  }
-  if (m_dialogStyle & wxICON_EXCLAMATION)
-    msStyle |= MB_ICONEXCLAMATION;
-  else if (m_dialogStyle & wxICON_HAND)
-    msStyle |= MB_ICONHAND;
-  else if (m_dialogStyle & wxICON_INFORMATION)
-    msStyle |= MB_ICONINFORMATION;
-  else if (m_dialogStyle & wxICON_QUESTION)
-    msStyle |= MB_ICONQUESTION;
-
-  if (hWnd)
-    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)
-  {
-    case IDCANCEL:
-      ans = wxID_CANCEL;
-      break;
-    case IDOK:
-      ans = wxID_OK;
-      break;
-    case IDYES:
-      ans = wxID_YES;
-      break;
-    case IDNO:
-      ans = wxID_NO;
-      break;
-  }
-  return ans;
+        msStyle |= MB_TASKMODAL;
+#endif
+
+    // do show the dialog
+    int msAns = MessageBox(hWnd, m_message.c_str(), m_caption.c_str(), msStyle);
+    int ans;
+    switch (msAns)
+    {
+        default:
+            wxFAIL_MSG(_T("unexpected ::MessageBox() return code"));
+            // fall through
+
+        case IDCANCEL:
+            ans = wxID_CANCEL;
+            break;
+        case IDOK:
+            ans = wxID_OK;
+            break;
+        case IDYES:
+            ans = wxID_YES;
+            break;
+        case IDNO:
+            ans = wxID_NO;
+            break;
+    }
+    return ans;
 }