Rewrite wxExecute() implementation under Unix.

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

diff --git a/src/motif/msgdlg.cpp b/src/motif/msgdlg.cpp
index df115f63e7f00cfc7b6c86207e69839aeb0e1044..c4b5576dd8d9b7c5aaceb5f09d2c33bc54a527ca 100644 (file)
--- a/src/motif/msgdlg.cpp
+++ b/src/motif/msgdlg.cpp
@@ -21,7 +21,6 @@
 #include "wx/wxprec.h"
 
 #ifdef __VMS
 #include "wx/wxprec.h"
 
 #ifdef __VMS

-#define XtDisplay XTDISPLAY

 #pragma message disable nosimpint
 #include "wx/vms_x_fix.h"
 #endif
 #pragma message disable nosimpint
 #include "wx/vms_x_fix.h"
 #endif


@@ -41,6 +40,7 @@
     #include "wx/settings.h"
 #endif
 
     #include "wx/settings.h"
 #endif
 

+#include "wx/modalhook.h"

 #include "wx/motif/private.h"
 
 // ----------------------------------------------------------------------------
 #include "wx/motif/private.h"
 
 // ----------------------------------------------------------------------------


@@ -106,6 +106,8 @@ extern "C"
 
 int wxMessageDialog::ShowModal()
 {
 
 int wxMessageDialog::ShowModal()
 {

+    WX_HOOK_MODAL_DIALOG();
+

     const long style = GetMessageDialogStyle();
 
     DialogCreateFunction dialogCreateFunction;
     const long style = GetMessageDialogStyle();
 
     DialogCreateFunction dialogCreateFunction;


@@ -155,9 +157,9 @@ int wxMessageDialog::ShowModal()
 
     Display* dpy = XtDisplay(wParent);
 
 
     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++;
 
         XtSetArg(args[ac], XmNbackground, g_itemColors[wxBACK_INDEX].pixel); ac++;
         XtSetArg(args[ac], XmNtopShadowColor, g_itemColors[wxTOPS_INDEX].pixel); ac++;