X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2afb9e169048b77a41c63b4f4eea3b10daee641a..43f4e852a1b2ac37c3db6a2b87315192ac549191:/src/motif/msgdlg.cpp diff --git a/src/motif/msgdlg.cpp b/src/motif/msgdlg.cpp index df115f63e7..091d430d9d 100644 --- a/src/motif/msgdlg.cpp +++ b/src/motif/msgdlg.cpp @@ -21,7 +21,6 @@ #include "wx/wxprec.h" #ifdef __VMS -#define XtDisplay XTDISPLAY #pragma message disable nosimpint #include "wx/vms_x_fix.h" #endif @@ -41,6 +40,7 @@ #include "wx/settings.h" #endif +#include "wx/testing.h" #include "wx/motif/private.h" // ---------------------------------------------------------------------------- @@ -106,6 +106,8 @@ extern "C" int wxMessageDialog::ShowModal() { + WX_TESTING_SHOW_MODAL_HOOK(); + const long style = GetMessageDialogStyle(); DialogCreateFunction dialogCreateFunction; @@ -155,9 +157,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++;