#include "wx/wxprec.h"
#ifdef __BORLANDC__
-#pragma hdrstop
+ #pragma hdrstop
+#endif
+
+#if wxUSE_MSGDLG
+
+#include "wx/msgdlg.h"
+
+// there is no hook support under CE so we can't use the code for message box
+// positioning there
+#ifndef __WXWINCE__
+ #define wxUSE_MSGBOX_HOOK 1
+#else
+ #define wxUSE_MSGBOX_HOOK 0
#endif
#ifndef WX_PRECOMP
#include "wx/app.h"
- #include "wx/defs.h"
#include "wx/utils.h"
#include "wx/dialog.h"
- #include "wx/msgdlg.h"
+ #if wxUSE_MSGBOX_HOOK
+ #include "wx/hashmap.h"
+ #endif
#endif
#include "wx/msw/private.h"
IMPLEMENT_CLASS(wxMessageDialog, wxDialog)
-wxMessageDialog::wxMessageDialog(wxWindow *parent,
- const wxString& message,
- const wxString& caption,
- long style,
- const wxPoint& WXUNUSED(pos))
+#if wxUSE_MSGBOX_HOOK
+
+// there can potentially be one message box per thread so we use a hash map
+// with thread ids as keys and (currently shown) message boxes as values
+//
+// TODO: replace this with wxTLS once it's available
+WX_DECLARE_HASH_MAP(unsigned long, wxMessageDialog *,
+ wxIntegerHash, wxIntegerEqual,
+ wxMessageDialogMap);
+
+namespace
+{
+
+wxMessageDialogMap& HookMap()
{
- m_caption = caption;
- m_message = message;
- m_parent = parent;
- SetMessageDialogStyle(style);
+ static wxMessageDialogMap s_Map;
+
+ return s_Map;
}
+} // anonymous namespace
+
+/* static */
+WXLRESULT wxCALLBACK
+wxMessageDialog::HookFunction(int code, WXWPARAM wParam, WXLPARAM lParam)
+{
+ // Find the thread-local instance of wxMessageDialog
+ const DWORD tid = ::GetCurrentThreadId();
+ wxMessageDialogMap::iterator node = HookMap().find(tid);
+ wxCHECK_MSG( node != HookMap().end(), false,
+ wxT("bogus thread id in wxMessageDialog::Hook") );
+
+ wxMessageDialog * const wnd = node->second;
+
+ const HHOOK hhook = (HHOOK)wnd->m_hook;
+ const LRESULT rc = ::CallNextHookEx(hhook, code, wParam, lParam);
+
+ if ( code == HC_ACTION && lParam )
+ {
+ const CWPRETSTRUCT * const s = (CWPRETSTRUCT *)lParam;
+
+ if ( s->message == HCBT_ACTIVATE )
+ {
+ // we won't need this hook any longer
+ ::UnhookWindowsHookEx(hhook);
+ wnd->m_hook = NULL;
+ HookMap().erase(tid);
+
+ if ( wnd->GetMessageDialogStyle() & wxCENTER )
+ {
+ wnd->SetHWND(s->hwnd);
+ wnd->Center(); // center on parent
+ wnd->SetHWND(NULL);
+ }
+ //else: default behaviour, center on screen
+ }
+ }
+
+ return rc;
+}
+
+#endif // wxUSE_MSGBOX_HOOK
+
+
int wxMessageDialog::ShowModal()
{
if ( !wxTheApp->GetTopWindow() )
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;
+ // 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
+
+#if wxUSE_MSGBOX_HOOK
+ // install the hook if we need to position the dialog in a non-default way
+ if ( wxStyle & wxCENTER )
+ {
+ const DWORD tid = ::GetCurrentThreadId();
+ m_hook = ::SetWindowsHookEx(WH_CALLWNDPROCRET,
+ &wxMessageDialog::HookFunction, NULL, tid);
+ HookMap()[tid] = this;
+ }
+#endif // wxUSE_MSGBOX_HOOK
+
// do show the dialog
- int msAns = MessageBox(hWnd, m_message.c_str(), m_caption.c_str(), msStyle);
+ int msAns = MessageBox(hWnd, message.wx_str(), m_caption.wx_str(), msStyle);
int ans;
switch (msAns)
{
return ans;
}
+#endif // wxUSE_MSGDLG