Forgot border when reversing coordinates for RTL.

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

diff --git a/src/os2/msgdlg.cpp b/src/os2/msgdlg.cpp
index 51704339e5bfb45601900b404fec444a8bb068c4..90d433a0899e89e467eed844723b6cdb479ce82c 100644 (file)
--- a/src/os2/msgdlg.cpp
+++ b/src/os2/msgdlg.cpp
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        msgdlg.cpp
+// Name:        src/os2/msgdlg.cpp
 // Purpose:     wxMessageDialog
 // Author:      David Webster
 // Modified by:
 // Created:     10/10/99
-// RCS-ID:      $$
+// RCS-ID:      $Id$
 // Copyright:   (c) David Webster
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -12,17 +12,18 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#ifndef WX_PRECOMP
-#include <stdio.h>
-#include "wx/defs.h"
-#include "wx/utils.h"
-#include "wx/dialog.h"
 #include "wx/msgdlg.h"
+
+#ifndef WX_PRECOMP
+    #include <stdio.h>
+    #include "wx/utils.h"
+    #include "wx/dialog.h"
+    #include "wx/app.h"
+    #include "wx/math.h"
 #endif
 
 #include "wx/os2/private.h"
 
-#include <math.h>
 #include <stdlib.h>
 #include <string.h>
 
@@ -31,18 +32,103 @@
 
 IMPLEMENT_CLASS(wxMessageDialog, wxDialog)
 
-wxMessageDialog::wxMessageDialog(wxWindow *parent, const wxString& message, const wxString& caption,
-        long style, const wxPoint& pos)
+wxMessageDialog::wxMessageDialog( wxWindow*       WXUNUSED(pParent),
+                                  const wxString& rsMessage,
+                                  const wxString& rsCaption,
+                                  long            lStyle,
+                                  const wxPoint&  WXUNUSED(pPos) )
 {
-    m_caption = caption;
-    m_message = message;
-    m_dialogStyle = style;
-    m_parent = parent;
-}
+    m_sCaption     = rsCaption;
+    m_sMessage     = rsMessage;
+    m_pParent      = NULL; // pParent;
+    SetMessageDialogStyle(lStyle);
+} // end of wxMessageDialog::wxMessageDialog
 
 int wxMessageDialog::ShowModal()
 {
-    // TODO
-    return wxID_CANCEL;
-}
+    HWND                            hWnd = 0;
+    ULONG                           ulStyle = MB_OK;
+    int                             nAns = wxOK;
+    const long                      lStyle = GetMessageDialogStyle();
+
+    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();
+    }
+
+    if (m_pParent)
+        hWnd = (HWND) m_pParent->GetHWND();
+    else
+        hWnd = HWND_DESKTOP;
+    if (lStyle & wxYES_NO)
+    {
+        if (lStyle & wxCANCEL)
+            ulStyle = MB_YESNOCANCEL;
+        else
+            ulStyle = MB_YESNO;
+
+        if (lStyle & wxNO_DEFAULT)
+            ulStyle |= MB_DEFBUTTON2;
+    }
+
+    if (lStyle & wxOK)
+    {
+        if (lStyle & wxCANCEL)
+            ulStyle = MB_OKCANCEL;
+        else
+            ulStyle = MB_OK;
+    }
+    if (lStyle & wxICON_EXCLAMATION)
+        ulStyle |= MB_ICONEXCLAMATION;
+    else if (lStyle & wxICON_HAND)
+        ulStyle |= MB_ICONHAND;
+    else if (lStyle & wxICON_INFORMATION)
+        ulStyle |= MB_ICONEXCLAMATION;
+    else if (lStyle & wxICON_QUESTION)
+        ulStyle |= MB_ICONQUESTION;
+
+    if (hWnd != HWND_DESKTOP)
+        ulStyle |= MB_APPLMODAL;
+    else
+        ulStyle |= MB_SYSTEMMODAL;
+
+    //
+    // This little line of code is get message boxes under OS/2 to
+    // behve like the other ports.  In OS/2 if the parent is a window
+    // it displays, clipped, in the window.  This centers it on the
+    // desktop, like the other ports but still allows control over modality
+    //
+    hWnd = HWND_DESKTOP;
 
+    ULONG                           ulAns = ::WinMessageBox( hWnd
+                                                            ,hWnd
+                                                            ,(PSZ)m_sMessage.c_str()
+                                                            ,(PSZ)m_sCaption.c_str()
+                                                            ,0L
+                                                            ,ulStyle);
+    switch (ulAns)
+    {
+        case MBID_CANCEL:
+            nAns = wxID_CANCEL;
+            break;
+        case MBID_OK:
+            nAns = wxID_OK;
+            break;
+        case MBID_YES:
+            nAns = wxID_YES;
+            break;
+        case MBID_NO:
+            nAns = wxID_NO;
+            break;
+        default:
+           nAns = wxID_CANCEL;
+    }
+    return nAns;
+} // end of wxMessageDialog::ShowModal