Added wxAddGrab, wxRemoveGrab for use by popup window implementations

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

diff --git a/src/os2/msgdlg.cpp b/src/os2/msgdlg.cpp
index 8aaa2313cc60038050d2efa3724d7600bf51844a..0826f701b02a5031ab42272bc6e1e59cf1673517 100644 (file)
--- a/src/os2/msgdlg.cpp
+++ b/src/os2/msgdlg.cpp
@@ -1,18 +1,14 @@
 /////////////////////////////////////////////////////////////////////////////
-// 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
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "msgdlg.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -23,11 +19,11 @@
 #include "wx/dialog.h"
 #include "wx/app.h"
 #include "wx/msgdlg.h"
+#include "wx/math.h"
 #endif
 
 #include "wx/os2/private.h"
 
-#include <math.h>
 #include <stdlib.h>
 #include <string.h>
 
@@ -36,18 +32,16 @@
 
 IMPLEMENT_CLASS(wxMessageDialog, wxDialog)
 
-wxMessageDialog::wxMessageDialog(
-  wxWindow*                         pParent
-, const wxString&                   rsMessage
-, const wxString&                   rsCaption
-, long                              lStyle
-, const wxPoint&                    pPos
-)
+wxMessageDialog::wxMessageDialog( wxWindow*       WXUNUSED(pParent),
+                                  const wxString& rsMessage,
+                                  const wxString& rsCaption,
+                                  long            lStyle,
+                                  const wxPoint&  WXUNUSED(pPos) )
 {
     m_sCaption     = rsCaption;
     m_sMessage     = rsMessage;
-    m_lDialogStyle = lStyle;
     m_pParent      = NULL; // pParent;
+    SetMessageDialogStyle(lStyle);
 } // end of wxMessageDialog::wxMessageDialog
 
 int wxMessageDialog::ShowModal()
@@ -55,6 +49,7 @@ int wxMessageDialog::ShowModal()
     HWND                            hWnd = 0;
     ULONG                           ulStyle = MB_OK;
     int                             nAns = wxOK;
+    const long                      lStyle = GetMessageDialogStyle();
 
     if (!wxTheApp->GetTopWindow())
     {
@@ -72,31 +67,31 @@ int wxMessageDialog::ShowModal()
         hWnd = (HWND) m_pParent->GetHWND();
     else
         hWnd = HWND_DESKTOP;
-    if (m_lDialogStyle & wxYES_NO)
+    if (lStyle & wxYES_NO)
     {
-        if (m_lDialogStyle & wxCANCEL)
+        if (lStyle & wxCANCEL)
             ulStyle = MB_YESNOCANCEL;
         else
             ulStyle = MB_YESNO;
 
-        if (m_lDialogStyle & wxNO_DEFAULT)
+        if (lStyle & wxNO_DEFAULT)
             ulStyle |= MB_DEFBUTTON2;
     }
 
-    if (m_lDialogStyle & wxOK)
+    if (lStyle & wxOK)
     {
-        if (m_lDialogStyle & wxCANCEL)
+        if (lStyle & wxCANCEL)
             ulStyle = MB_OKCANCEL;
         else
             ulStyle = MB_OK;
     }
-    if (m_lDialogStyle & wxICON_EXCLAMATION)
+    if (lStyle & wxICON_EXCLAMATION)
         ulStyle |= MB_ICONEXCLAMATION;
-    else if (m_lDialogStyle & wxICON_HAND)
+    else if (lStyle & wxICON_HAND)
         ulStyle |= MB_ICONHAND;
-    else if (m_lDialogStyle & wxICON_INFORMATION)
+    else if (lStyle & wxICON_INFORMATION)
         ulStyle |= MB_ICONEXCLAMATION;
-    else if (m_lDialogStyle & wxICON_QUESTION)
+    else if (lStyle & wxICON_QUESTION)
         ulStyle |= MB_ICONQUESTION;
 
     if (hWnd != HWND_DESKTOP)
@@ -137,4 +132,3 @@ int wxMessageDialog::ShowModal()
     }
     return nAns;
 } // end of wxMessageDialog::ShowModal
-