/////////////////////////////////////////////////////////////////////////////
-// Name: msgdlg.cpp
+// Name: src/msw/msgdlg.cpp
// Purpose: wxMessageDialog
// Author: Julian Smart
// 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__
-#pragma implementation "msgdlg.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#ifdef __BORLANDC__
-#pragma hdrstop
+ #pragma hdrstop
#endif
+#include "wx/msgdlg.h"
+
#ifndef WX_PRECOMP
#include "wx/app.h"
- #include "wx/defs.h"
#include "wx/utils.h"
#include "wx/dialog.h"
- #include "wx/msgdlg.h"
#endif
#include "wx/msw/private.h"
+// For MB_TASKMODAL
+#ifdef __WXWINCE__
+#include "wx/msw/wince/missing.h"
+#endif
+
IMPLEMENT_CLASS(wxMessageDialog, wxDialog)
wxMessageDialog::wxMessageDialog(wxWindow *parent,
{
m_caption = caption;
m_message = message;
- m_dialogStyle = style;
m_parent = parent;
+ SetMessageDialogStyle(style);
}
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
}
// 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;
- if (m_dialogStyle & wxYES_NO)
+ const long wxStyle = GetMessageDialogStyle();
+ if (wxStyle & wxYES_NO)
{
- if (m_dialogStyle & wxCANCEL)
+#if !(defined(__SMARTPHONE__) && defined(__WXWINCE__))
+ if (wxStyle & wxCANCEL)
msStyle = MB_YESNOCANCEL;
else
+#endif // !(__SMARTPHONE__ && __WXWINCE__)
msStyle = MB_YESNO;
- if (m_dialogStyle & wxNO_DEFAULT)
+ if (wxStyle & wxNO_DEFAULT)
msStyle |= MB_DEFBUTTON2;
}
- if (m_dialogStyle & wxOK)
+ if (wxStyle & wxOK)
{
- if (m_dialogStyle & wxCANCEL)
+ if (wxStyle & wxCANCEL)
msStyle = MB_OKCANCEL;
else
msStyle = MB_OK;
}
- if (m_dialogStyle & wxICON_EXCLAMATION)
+ if (wxStyle & wxICON_EXCLAMATION)
msStyle |= MB_ICONEXCLAMATION;
- else if (m_dialogStyle & wxICON_HAND)
+ else if (wxStyle & wxICON_HAND)
msStyle |= MB_ICONHAND;
- else if (m_dialogStyle & wxICON_INFORMATION)
+ else if (wxStyle & wxICON_INFORMATION)
msStyle |= MB_ICONINFORMATION;
- else if (m_dialogStyle & wxICON_QUESTION)
+ else if (wxStyle & wxICON_QUESTION)
msStyle |= MB_ICONQUESTION;
+ if ( wxStyle & wxSTAY_ON_TOP )
+ msStyle |= MB_TOPMOST;
+
+#ifndef __WXWINCE__
+ if ( wxTheApp->GetLayoutDirection() == wxLayout_RightToLeft )
+ msStyle |= MB_RTLREADING | MB_RIGHT;
+#endif
+
if (hWnd)
msStyle |= MB_APPLMODAL;
else
}
return ans;
}
-