X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2afb9e169048b77a41c63b4f4eea3b10daee641a..486a0fa75f8ae4ef12968ef0eee8b54b066d11af:/src/motif/msgdlg.cpp?ds=sidebyside diff --git a/src/motif/msgdlg.cpp b/src/motif/msgdlg.cpp index df115f63e7..b26430c4c4 100644 --- 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++;