fixing osx_carbon

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

diff --git a/src/os2/msgdlg.cpp b/src/os2/msgdlg.cpp
index 0826f701b02a5031ab42272bc6e1e59cf1673517..97e9b8f99c4ca1d7e317208b7a86616c1d04f355 100644 (file)
--- a/src/os2/msgdlg.cpp
+++ b/src/os2/msgdlg.cpp
@@ -12,14 +12,14 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // 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/app.h"

 #include "wx/msgdlg.h"
 #include "wx/msgdlg.h"

-#include "wx/math.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"
 #endif
 
 #include "wx/os2/private.h"


@@ -32,18 +32,6 @@
 
 IMPLEMENT_CLASS(wxMessageDialog, wxDialog)
 
 
 IMPLEMENT_CLASS(wxMessageDialog, wxDialog)
 

-wxMessageDialog::wxMessageDialog( wxWindow*       WXUNUSED(pParent),
-                                  const wxString& rsMessage,
-                                  const wxString& rsCaption,
-                                  long            lStyle,
-                                  const wxPoint&  WXUNUSED(pPos) )
-{
-    m_sCaption     = rsCaption;
-    m_sMessage     = rsMessage;
-    m_pParent      = NULL; // pParent;
-    SetMessageDialogStyle(lStyle);
-} // end of wxMessageDialog::wxMessageDialog
-

 int wxMessageDialog::ShowModal()
 {
     HWND                            hWnd = 0;
 int wxMessageDialog::ShowModal()
 {
     HWND                            hWnd = 0;


@@ -63,8 +51,8 @@ int wxMessageDialog::ShowModal()
             wxTheApp->Dispatch();
     }
 
             wxTheApp->Dispatch();
     }
 

-    if (m_pParent)
-        hWnd = (HWND) m_pParent->GetHWND();
+    if (m_parent)
+        hWnd = (HWND) m_parent->GetHWND();

     else
         hWnd = HWND_DESKTOP;
     if (lStyle & wxYES_NO)
     else
         hWnd = HWND_DESKTOP;
     if (lStyle & wxYES_NO)


@@ -85,14 +73,25 @@ int wxMessageDialog::ShowModal()
         else
             ulStyle = MB_OK;
     }
         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;
+
+    switch ( GetEffectiveIcon() )
+    {
+        case wxICON_ERROR:
+            ulStyle |= MB_ERROR;
+            break;
+
+        case wxICON_WARNING:
+            ulStyle |= MB_WARNING;
+            break;
+
+        case wxICON_QUESTION:
+            ulStyle |= MB_QUERY;
+            break;
+
+        case wxICON_INFORMATION:
+            ulStyle |= MB_INFORMATION;
+            break;
+    }

 
     if (hWnd != HWND_DESKTOP)
         ulStyle |= MB_APPLMODAL;
 
     if (hWnd != HWND_DESKTOP)
         ulStyle |= MB_APPLMODAL;


@@ -109,8 +108,8 @@ int wxMessageDialog::ShowModal()
 
     ULONG                           ulAns = ::WinMessageBox( hWnd
                                                             ,hWnd
 
     ULONG                           ulAns = ::WinMessageBox( hWnd
                                                             ,hWnd

-                                                            ,(PSZ)m_sMessage.c_str()
-                                                            ,(PSZ)m_sCaption.c_str()
+                                                            ,GetFullMessage().c_str()
+                                                            ,m_caption.c_str()

                                                             ,0L
                                                             ,ulStyle);
     switch (ulAns)
                                                             ,0L
                                                             ,ulStyle);
     switch (ulAns)