X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..12bb29f5432174ecbd65549bda832d70d34a98ae:/src/motif/msgdlg.cpp diff --git a/src/motif/msgdlg.cpp b/src/motif/msgdlg.cpp index 93e95ecf61..c4b5576dd8 100644 --- a/src/motif/msgdlg.cpp +++ b/src/motif/msgdlg.cpp @@ -20,12 +20,9 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#include "wx/defs.h" - #ifdef __VMS -#define XtDisplay XTDISPLAY #pragma message disable nosimpint -#include +#include "wx/vms_x_fix.h" #endif #include @@ -35,11 +32,16 @@ #pragma message enable nosimpint #endif -#include "wx/app.h" -#include "wx/intl.h" #include "wx/msgdlg.h" + +#ifndef WX_PRECOMP + #include "wx/intl.h" + #include "wx/app.h" + #include "wx/settings.h" +#endif + +#include "wx/modalhook.h" #include "wx/motif/private.h" -#include "wx/settings.h" // ---------------------------------------------------------------------------- // macros @@ -97,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); @@ -116,6 +106,8 @@ extern "C" int wxMessageDialog::ShowModal() { + WX_HOOK_MODAL_DIALOG(); + const long style = GetMessageDialogStyle(); DialogCreateFunction dialogCreateFunction; @@ -158,19 +150,22 @@ 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); - wxComputeColours (dpy, & m_backgroundColour, (wxColour*) NULL); + if (m_backgroundColour.IsOk()) + { + 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], XmNbottomShadowColor, g_itemColors[wxBOTS_INDEX].pixel); ac++; - XtSetArg(args[ac], XmNforeground, g_itemColors[wxFORE_INDEX].pixel); ac++; + XtSetArg(args[ac], XmNbackground, g_itemColors[wxBACK_INDEX].pixel); ac++; + XtSetArg(args[ac], XmNtopShadowColor, g_itemColors[wxTOPS_INDEX].pixel); ac++; + XtSetArg(args[ac], XmNbottomShadowColor, g_itemColors[wxBOTS_INDEX].pixel); ac++; + XtSetArg(args[ac], XmNforeground, g_itemColors[wxFORE_INDEX].pixel); ac++; + } wxFont font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT); @@ -267,4 +262,3 @@ int wxMessageDialog::ShowModal() return m_result; } -