X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a7fd7c7851405371db0171181f240591cca38158..cb73e6001f891ae46b12a1e4ca39b93649cb6099:/src/msw/msgdlg.cpp?ds=sidebyside diff --git a/src/msw/msgdlg.cpp b/src/msw/msgdlg.cpp index 834fbdb022..c51438155d 100644 --- a/src/msw/msgdlg.cpp +++ b/src/msw/msgdlg.cpp @@ -5,11 +5,11 @@ // Modified by: // Created: 04/01/98 // RCS-ID: $Id$ -// Copyright: (c) Julian Smart and Markus Holzem -// Licence: wxWindows license +// Copyright: (c) Julian Smart +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "msgdlg.h" #endif @@ -38,6 +38,15 @@ wxMessageDialog::wxMessageDialog(wxWindow *parent, long style, const wxPoint& WXUNUSED(pos)) { +#ifdef __WXDEBUG__ + // check for common programming errors + if ( (style & wxID_OK) == wxID_OK ) + { + // programmer probably confused wxID_OK with wxOK. Correct one is wxOK. + wxFAIL_MSG( _T("wxMessageBox: Did you mean wxOK (and not wxID_OK)?") ); + } +#endif // __WXDEBUG__ + m_caption = caption; m_message = message; m_dialogStyle = style; @@ -46,8 +55,7 @@ wxMessageDialog::wxMessageDialog(wxWindow *parent, int wxMessageDialog::ShowModal() { - wxWindow *winTop = wxTheApp->GetTopWindow(); - if ( !winTop ) + if ( !wxTheApp->GetTopWindow() ) { // when the message box is shown from wxApp::OnInit() (i.e. before the // message loop is entered), this must be done or the next message box @@ -58,11 +66,9 @@ int wxMessageDialog::ShowModal() } // use the top level window as parent if none specified - HWND hWnd = 0; - if ( m_parent ) - hWnd = GetHwndOf(m_parent); - else if ( winTop ) - hWnd = GetHwndOf(winTop); + if ( !m_parent ) + m_parent = FindSuitableParent(); + HWND hWnd = m_parent ? GetHwndOf(m_parent) : NULL; // translate wx style in MSW unsigned int msStyle = MB_OK; @@ -98,8 +104,10 @@ int wxMessageDialog::ShowModal() if (hWnd) msStyle |= MB_APPLMODAL; +#ifndef __WXWINCE__ else msStyle |= MB_TASKMODAL; +#endif // do show the dialog int msAns = MessageBox(hWnd, m_message.c_str(), m_caption.c_str(), msStyle);