use (new) safer GetTraitsIfExists() in wxMutexGuiEnter/Leave() to avoid crashing...

[wxWidgets.git] / src / msw / msgdlg.cpp

diff --git a/src/msw/msgdlg.cpp b/src/msw/msgdlg.cpp
index 5312a8ec0668f9371b88aa83e98e9c0cd121deaf..0d8ebb2b77166368e90673f261a674b4c6bfc935 100644 (file)
--- a/src/msw/msgdlg.cpp
+++ b/src/msw/msgdlg.cpp
@@ -16,12 +16,25 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_MSGDLG
+

 #include "wx/msgdlg.h"
 
 #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/utils.h"
     #include "wx/dialog.h"
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/utils.h"
     #include "wx/dialog.h"

+    #if wxUSE_MSGBOX_HOOK
+        #include "wx/hashmap.h"
+    #endif

 #endif
 
 #include "wx/msw/private.h"
 #endif
 
 #include "wx/msw/private.h"


@@ -33,18 +46,70 @@
 
 IMPLEMENT_CLASS(wxMessageDialog, wxDialog)
 
 
 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

 {
 {

-    m_caption = caption;
-    m_message = message;
-    m_parent = parent;
-    SetMessageDialogStyle(style);
+
+wxMessageDialogMap& HookMap()
+{
+    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() )
 int wxMessageDialog::ShowModal()
 {
     if ( !wxTheApp->GetTopWindow() )


@@ -110,7 +175,7 @@ int wxMessageDialog::ShowModal()
     // 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)
     // 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 = m_message;
+    wxString message = GetFullMessage();

 #if wxUSE_UNICODE
     if ( wxTheApp->GetLayoutDirection() == wxLayout_RightToLeft )
     {
 #if wxUSE_UNICODE
     if ( wxTheApp->GetLayoutDirection() == wxLayout_RightToLeft )
     {


@@ -120,8 +185,19 @@ int wxMessageDialog::ShowModal()
     }
 #endif // wxUSE_UNICODE
 
     }
 #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
     // do show the dialog

-    int msAns = MessageBox(hWnd, message, m_caption, msStyle);
+    int msAns = MessageBox(hWnd, message.wx_str(), m_caption.wx_str(), msStyle);

     int ans;
     switch (msAns)
     {
     int ans;
     switch (msAns)
     {


@@ -144,3 +220,5 @@ int wxMessageDialog::ShowModal()
     }
     return ans;
 }
     }
     return ans;
 }

+
+#endif // wxUSE_MSGDLG