X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e5b507581053d7a11b5c1419dc3ac5c31904236b..3cb6eaec797ebbe20a0e05e5c9ba625909845e72:/src/os2/msgdlg.cpp?ds=sidebyside diff --git a/src/os2/msgdlg.cpp b/src/os2/msgdlg.cpp index 1c7e16b39b..4504fd97c7 100644 --- a/src/os2/msgdlg.cpp +++ b/src/os2/msgdlg.cpp @@ -9,21 +9,17 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "msgdlg.h" -#endif - // 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" @@ -36,20 +32,6 @@ IMPLEMENT_CLASS(wxMessageDialog, wxDialog) -wxMessageDialog::wxMessageDialog( - wxWindow* pParent -, const wxString& rsMessage -, const wxString& rsCaption -, long lStyle -, const wxPoint& pPos -) -{ - m_sCaption = rsCaption; - m_sMessage = rsMessage; - m_pParent = NULL; // pParent; - SetMessageDialogStyle(lStyle); -} // end of wxMessageDialog::wxMessageDialog - int wxMessageDialog::ShowModal() { HWND hWnd = 0; @@ -69,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) @@ -115,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) @@ -138,4 +120,3 @@ int wxMessageDialog::ShowModal() } return nAns; } // end of wxMessageDialog::ShowModal -