Applied patch #15540: wxRichTextTable: crashes due to an invalid focus object (dghart)

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

diff --git a/src/motif/msgdlg.cpp b/src/motif/msgdlg.cpp
index df115f63e7f00cfc7b6c86207e69839aeb0e1044..b26430c4c457bdbc64f0b8febf01bc36b14401b2 100644 (file)
--- a/src/motif/msgdlg.cpp
+++ b/src/motif/msgdlg.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -21,7 +20,6 @@
 #include "wx/wxprec.h"
 
 #ifdef __VMS
-#define XtDisplay XTDISPLAY
 #pragma message disable nosimpint
 #include "wx/vms_x_fix.h"
 #endif
@@ -41,6 +39,7 @@
     #include "wx/settings.h"
 #endif
 
+#include "wx/modalhook.h"
 #include "wx/motif/private.h"
 
 // ----------------------------------------------------------------------------
@@ -106,6 +105,8 @@ extern "C"
 
 int wxMessageDialog::ShowModal()
 {
+    WX_HOOK_MODAL_DIALOG();
+
     const long style = GetMessageDialogStyle();
 
     DialogCreateFunction dialogCreateFunction;
@@ -155,9 +156,9 @@ int wxMessageDialog::ShowModal()
 
     Display* dpy = XtDisplay(wParent);
 
-    if (m_backgroundColour.Ok())
+    if (m_backgroundColour.IsOk())
     {
-        wxComputeColours (dpy, & m_backgroundColour, (wxColour*) NULL);
+        wxComputeColours (dpy, & m_backgroundColour, NULL);
 
         XtSetArg(args[ac], XmNbackground, g_itemColors[wxBACK_INDEX].pixel); ac++;
         XtSetArg(args[ac], XmNtopShadowColor, g_itemColors[wxTOPS_INDEX].pixel); ac++;