#include "wx/math.h"
#endif
+#include "wx/testing.h"
#include "wx/os2/private.h"
#include <stdlib.h>
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()
{
+ WX_TESTING_SHOW_MODAL_HOOK();
+
HWND hWnd = 0;
ULONG ulStyle = MB_OK;
int nAns = wxOK;
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
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;
ULONG ulAns = ::WinMessageBox( hWnd
,hWnd
- ,m_sMessage.c_str()
- ,m_sCaption.c_str()
+ ,GetFullMessage().c_str()
+ ,m_caption.c_str()
,0L
,ulStyle);
switch (ulAns)