/////////////////////////////////////////////////////////////////////////////
-// 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
+#if wxUSE_MSGDLG
+
+#include "wx/msgdlg.h"
+
#ifndef WX_PRECOMP
- #include "wx/defs.h"
+ #include "wx/app.h"
#include "wx/utils.h"
#include "wx/dialog.h"
- #include "wx/msgdlg.h"
#endif
#include "wx/msw/private.h"
-IMPLEMENT_CLASS(wxMessageDialog, wxDialog)
+// For MB_TASKMODAL
+#ifdef __WXWINCE__
+#include "wx/msw/wince/missing.h"
+#endif
-wxMessageDialog::wxMessageDialog(wxWindow *parent,
- const wxString& message,
- const wxString& caption,
- long style,
- const wxPoint& WXUNUSED(pos))
-{
- m_caption = caption;
- m_message = message;
- m_dialogStyle = style;
- m_parent = parent;
-}
+IMPLEMENT_CLASS(wxMessageDialog, wxDialog)
int wxMessageDialog::ShowModal()
{
wxTheApp->Dispatch();
}
- HWND hWnd = 0;
- if (m_parent) hWnd = (HWND) m_parent->GetHWND();
+ // use the top level window as parent if none specified
+ 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
msStyle |= MB_TASKMODAL;
- int msAns = MessageBox(hWnd, (LPCTSTR)m_message.c_str(),
- (LPCTSTR)m_caption.c_str(), msStyle);
- int ans = wxOK;
+ // per MSDN documentation for MessageBox() we can prefix the message with 2
+ // right-to-left mark characters to tell the function to use RTL layout
+ // (unfortunately this only works in Unicode builds)
+ wxString message = GetFullMessage();
+#if wxUSE_UNICODE
+ if ( wxTheApp->GetLayoutDirection() == wxLayout_RightToLeft )
+ {
+ // NB: not all compilers support \u escapes
+ static const wchar_t wchRLM = 0x200f;
+ message.Prepend(wxString(wchRLM, 2));
+ }
+#endif // wxUSE_UNICODE
+
+ // do show the dialog
+ int msAns = MessageBox(hWnd, message.wx_str(), m_caption.wx_str(), msStyle);
+ int ans;
switch (msAns)
{
+ default:
+ wxFAIL_MSG(_T("unexpected ::MessageBox() return code"));
+ // fall through
+
case IDCANCEL:
ans = wxID_CANCEL;
break;
return ans;
}
+#endif // wxUSE_MSGDLG