Fixed wxMessageBox with only an OK button returning wxCANCEL under MSW.

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

diff --git a/src/motif/msgdlg.cpp b/src/motif/msgdlg.cpp
index 6b7e61f69fc9f5791bf5573a70c087e73d805760..d648c0e78c95c06afb287d1aea9bde23c0417f30 100644 (file)
--- a/src/motif/msgdlg.cpp
+++ b/src/motif/msgdlg.cpp
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        msgdlg.cpp
+// Name:        src/motif/msgdlg.cpp

 // Purpose:     wxMessageDialog
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
 // Purpose:     wxMessageDialog
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98

-// RCS-ID:      $$
+// RCS-ID:      $Id$

 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -13,17 +13,16 @@
 // declarations
 // ============================================================================
 
 // declarations
 // ============================================================================
 

-#ifdef __GNUG__
-    #pragma implementation "msgdlg.h"
-#endif
-

 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
 

+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+

 #ifdef __VMS
 #pragma message disable nosimpint
 #ifdef __VMS
 #pragma message disable nosimpint

-#include <wx/vms_x_fix.h>
+#include "wx/vms_x_fix.h"

 #endif
 #include <X11/Xlib.h>
 
 #endif
 #include <X11/Xlib.h>
 


@@ -33,9 +32,14 @@
 #pragma message enable nosimpint
 #endif
 
 #pragma message enable nosimpint
 #endif
 

-#include "wx/app.h"
-#include "wx/intl.h"
-#include "wx/motif/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"
 
 // ----------------------------------------------------------------------------


@@ -94,32 +98,27 @@ static void msgboxCallBackClose(Widget w,
 // wxMessageDialog
 // ----------------------------------------------------------------------------
 
 // wxMessageDialog
 // ----------------------------------------------------------------------------
 

-wxMessageDialog::wxMessageDialog(wxWindow *parent,
-                                 const wxString& message,
-                                 const wxString& caption,
-                                 long style,
-                                 const wxPoint& WXUNUSED(pos))
+extern "C"

 {
 {

-    m_caption = caption;
-    m_message = message;
-    m_dialogStyle = style;
-    m_parent = parent;
+    typedef Widget (*DialogCreateFunction)(Widget, String, ArgList, Cardinal);

 }
 
 int wxMessageDialog::ShowModal()
 {
 }
 
 int wxMessageDialog::ShowModal()
 {

-    Widget (*dialogCreateFunction)(Widget, String, ArgList, Cardinal) = NULL;
-    if ( m_dialogStyle & wxYES_NO )
+    const long style = GetMessageDialogStyle();
+
+    DialogCreateFunction dialogCreateFunction;
+    if ( style & wxYES_NO )

     {
         // if we have [Yes], it must be a question
         dialogCreateFunction = XmCreateQuestionDialog;
     }
     {
         // if we have [Yes], it must be a question
         dialogCreateFunction = XmCreateQuestionDialog;
     }

-    else if ( m_dialogStyle & wxICON_STOP )
+    else if ( style & wxICON_STOP )

     {
         // error dialog is the one with error icon...
         dialogCreateFunction = XmCreateErrorDialog;
     }
     {
         // error dialog is the one with error icon...
         dialogCreateFunction = XmCreateErrorDialog;
     }

-    else if ( m_dialogStyle & wxICON_EXCLAMATION )
+    else if ( style & wxICON_EXCLAMATION )

     {
         // ...and the warning dialog too
         dialogCreateFunction = XmCreateWarningDialog;
     {
         // ...and the warning dialog too
         dialogCreateFunction = XmCreateWarningDialog;


@@ -148,22 +147,38 @@ 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++;
 
     wxXmString title(m_caption);
     XtSetArg(args[ac], XmNmessageString, text()); ac++;
     XtSetArg(args[ac], XmNdialogTitle, title()); ac++;
 

-    wxComputeColours (XtDisplay(wParent), & m_backgroundColour,
-        (wxColour*) NULL);
+    Display* dpy = XtDisplay(wParent);

 
 

-    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++;
+    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++;
+    }
+
+    wxFont font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
+
+#if __WXMOTIF20__ && !__WXLESSTIF__
+    XtSetArg(args[ac], XmNbuttonRenderTable, font.GetFontTypeC(dpy)); ac++;
+    XtSetArg(args[ac], XmNlabelRenderTable, font.GetFontTypeC(dpy)); ac++;
+    XtSetArg(args[ac], XmNtextRenderTable, font.GetFontTypeC(dpy)); ac++;
+#else
+    XtSetArg(args[ac], XmNbuttonFontList, font.GetFontTypeC(dpy)); ac++;
+    XtSetArg(args[ac], XmNlabelFontList, font.GetFontTypeC(dpy)); ac++;
+    XtSetArg(args[ac], XmNtextFontList, font.GetFontTypeC(dpy)); ac++;
+#endif

 
     // do create message box
 
 
     // do create message box
 

-    Widget wMsgBox = (*dialogCreateFunction)(wParent, "", args, ac);
+    Widget wMsgBox = (*dialogCreateFunction)(wParent, wxMOTIF_STR(""), args, ac);

 
     wxCHECK_MSG( wMsgBox, wxID_CANCEL, "msg box creation failed" );
 
 
     wxCHECK_MSG( wMsgBox, wxID_CANCEL, "msg box creation failed" );
 


@@ -174,11 +189,11 @@ int wxMessageDialog::ShowModal()
     Widget wBtnHelp = XmMessageBoxGetChild(wMsgBox, XmDIALOG_HELP_BUTTON);
     Widget wBtnCancel = XmMessageBoxGetChild(wMsgBox, XmDIALOG_CANCEL_BUTTON);
 
     Widget wBtnHelp = XmMessageBoxGetChild(wMsgBox, XmDIALOG_HELP_BUTTON);
     Widget wBtnCancel = XmMessageBoxGetChild(wMsgBox, XmDIALOG_CANCEL_BUTTON);
 

-    if ( m_dialogStyle & wxYES_NO )
+    if ( style & wxYES_NO )

     {
     {

-        wxXmString yes(_("Yes")), no(_("No")), cancel(_("Cancel"));            
+        wxXmString yes(_("Yes")), no(_("No")), cancel(_("Cancel"));

 
 

-        if ( m_dialogStyle & wxCANCEL )
+        if ( style & wxCANCEL )

         {
             // use the cancel button for No and the help button for
             // Cancel  Yuk :-)  MB
         {
             // use the cancel button for No and the help button for
             // Cancel  Yuk :-)  MB


@@ -202,7 +217,7 @@ int wxMessageDialog::ShowModal()
         // requested)
         //
         XtUnmanageChild(wBtnHelp);
         // requested)
         //
         XtUnmanageChild(wBtnHelp);

-        if ( !(m_dialogStyle & wxCANCEL ) ) XtUnmanageChild(wBtnCancel);
+        if ( !(style & wxCANCEL ) ) XtUnmanageChild(wBtnCancel);

     }
 
     // set the callbacks for the message box buttons
     }
 
     // set the callbacks for the message box buttons


@@ -232,7 +247,7 @@ int wxMessageDialog::ShowModal()
     }
 
     // translate the result if necessary
     }
 
     // translate the result if necessary

-    if ( m_dialogStyle & wxYES_NO )
+    if ( style & wxYES_NO )

     {
         if ( m_result == wxID_OK )
             m_result = wxID_YES;
     {
         if ( m_result == wxID_OK )
             m_result = wxID_YES;


@@ -244,4 +259,3 @@ int wxMessageDialog::ShowModal()
 
     return m_result;
 }
 
     return m_result;
 }

-