Fixed caret sizing bug

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

diff --git a/src/motif/msgdlg.cpp b/src/motif/msgdlg.cpp
index f51da838f19b7faf09e604adef42d9edcc939939..df115f63e7f00cfc7b6c86207e69839aeb0e1044 100644 (file)
--- a/src/motif/msgdlg.cpp
+++ b/src/motif/msgdlg.cpp
@@ -20,8 +20,6 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // 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
 #ifdef __VMS
 #define XtDisplay XTDISPLAY
 #pragma message disable nosimpint


@@ -35,11 +33,15 @@
 #pragma message enable nosimpint
 #endif
 
 #pragma message enable nosimpint
 #endif
 

-#include "wx/app.h"
-#include "wx/intl.h"

 #include "wx/msgdlg.h"
 #include "wx/msgdlg.h"

+
+#ifndef WX_PRECOMP
+    #include "wx/intl.h"
+    #include "wx/app.h"
+    #include "wx/settings.h"
+#endif
+

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

-#include "wx/settings.h"

 
 // ----------------------------------------------------------------------------
 // macros
 
 // ----------------------------------------------------------------------------
 // macros


@@ -97,18 +99,6 @@ static void msgboxCallBackClose(Widget w,
 // wxMessageDialog
 // ----------------------------------------------------------------------------
 
 // 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);
 extern "C"
 {
     typedef Widget (*DialogCreateFunction)(Widget, String, ArgList, Cardinal);


@@ -158,19 +148,22 @@ int wxMessageDialog::ShowModal()
     Arg args[10];
     int ac = 0;
 
     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);
 
     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.Ok())
+    {
+        wxComputeColours (dpy, & m_backgroundColour, (wxColour*) 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);
 
 
     wxFont font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);