X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/105fbe1ffa8968cb85fd2cac7192957e522d17ba..12bb29f5432174ecbd65549bda832d70d34a98ae:/src/motif/msgdlg.cpp diff --git a/src/motif/msgdlg.cpp b/src/motif/msgdlg.cpp index f103cfc0d1..c4b5576dd8 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/modalhook.h" #include "wx/motif/private.h" // ---------------------------------------------------------------------------- @@ -99,18 +99,6 @@ static void msgboxCallBackClose(Widget w, // wxMessageDialog // ---------------------------------------------------------------------------- -wxMessageDialog::wxMessageDialog(wxWindow *parent, - const wxString& message, - const wxString& caption, - long style, - const wxPoint& WXUNUSED(pos)) -{ - m_caption = caption; - m_message = message; - m_parent = parent; - SetMessageDialogStyle(style); -} - extern "C" { typedef Widget (*DialogCreateFunction)(Widget, String, ArgList, Cardinal); @@ -118,6 +106,8 @@ extern "C" int wxMessageDialog::ShowModal() { + WX_HOOK_MODAL_DIALOG(); + const long style = GetMessageDialogStyle(); DialogCreateFunction dialogCreateFunction; @@ -160,16 +150,16 @@ int wxMessageDialog::ShowModal() Arg args[10]; int ac = 0; - wxXmString text(m_message); + wxXmString text(GetFullMessage()); wxXmString title(m_caption); XtSetArg(args[ac], XmNmessageString, text()); ac++; XtSetArg(args[ac], XmNdialogTitle, title()); ac++; 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++;