X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..297218f05abc1432f355522f891145e58b9104d4:/src/os2/msgdlg.cpp diff --git a/src/os2/msgdlg.cpp b/src/os2/msgdlg.cpp index 0826f701b0..4504fd97c7 100644 --- 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" -#ifndef WX_PRECOMP -#include -#include "wx/defs.h" -#include "wx/utils.h" -#include "wx/dialog.h" -#include "wx/app.h" #include "wx/msgdlg.h" -#include "wx/math.h" + +#ifndef WX_PRECOMP + #include + #include "wx/utils.h" + #include "wx/dialog.h" + #include "wx/app.h" + #include "wx/math.h" #endif #include "wx/os2/private.h" @@ -32,18 +32,6 @@ 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; @@ -63,8 +51,8 @@ int wxMessageDialog::ShowModal() 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) @@ -109,8 +97,8 @@ int wxMessageDialog::ShowModal() 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)