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 177da7d522d8cf4434041ae07a797c632a40cb86..0d8ebb2b77166368e90673f261a674b4c6bfc935 100644 (file)
--- a/src/msw/msgdlg.cpp
+++ b/src/msw/msgdlg.cpp
@@ -20,11 +20,21 @@
 
 #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"
-    #include "wx/hashmap.h"
+    #if wxUSE_MSGBOX_HOOK
+        #include "wx/hashmap.h"
+    #endif
 #endif
 
 #include "wx/msw/private.h"
@@ -36,6 +46,8 @@
 
 IMPLEMENT_CLASS(wxMessageDialog, wxDialog)
 
+#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
 //
@@ -95,6 +107,9 @@ wxMessageDialog::HookFunction(int code, WXWPARAM wParam, WXLPARAM lParam)
     return rc;
 }
 
+#endif // wxUSE_MSGBOX_HOOK
+
+
 int wxMessageDialog::ShowModal()
 {
     if ( !wxTheApp->GetTopWindow() )
@@ -170,6 +185,7 @@ int wxMessageDialog::ShowModal()
     }
 #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 )
     {
@@ -178,6 +194,7 @@ int wxMessageDialog::ShowModal()
                                     &wxMessageDialog::HookFunction, NULL, tid);
         HookMap()[tid] = this;
     }
+#endif // wxUSE_MSGBOX_HOOK
 
     // do show the dialog
     int msAns = MessageBox(hWnd, message.wx_str(), m_caption.wx_str(), msStyle);