Remove deprecated methods use.

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

diff --git a/src/motif/msgdlg.cpp b/src/motif/msgdlg.cpp
index 74500a8fea5949426b0792ce00134dbbf9ccba7c..caf660584dc221d526285152829b97cd43a0a10d 100644 (file)
--- a/src/motif/msgdlg.cpp
+++ b/src/motif/msgdlg.cpp
@@ -21,10 +21,20 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

+#include "wx/defs.h"
+
+#ifdef __VMS
+#define XtDisplay XTDISPLAY
+#pragma message disable nosimpint
+#include <wx/vms_x_fix.h>
+#endif

 #include <X11/Xlib.h>
 
 #include <Xm/Xm.h>
 #include <Xm/MessageB.h>
 #include <X11/Xlib.h>
 
 #include <Xm/Xm.h>
 #include <Xm/MessageB.h>

+#ifdef __VMS
+#pragma message enable nosimpint
+#endif

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


@@ -35,9 +45,7 @@
 // macros
 // ----------------------------------------------------------------------------
 
 // macros
 // ----------------------------------------------------------------------------
 

-#if !USE_SHARED_LIBRARY

     IMPLEMENT_CLASS(wxMessageDialog, wxDialog)
     IMPLEMENT_CLASS(wxMessageDialog, wxDialog)

-#endif

 
 // ============================================================================
 // implementation
 
 // ============================================================================
 // implementation


@@ -48,7 +56,7 @@
 // ----------------------------------------------------------------------------
 
 // the common part
 // ----------------------------------------------------------------------------
 
 // the common part

-static void msgboxCallBack(Widget w, int client_data, int id)
+static void msgboxCallBack(Widget w, void* client_data, int id)

 {
     // close the dialog
     XtUnmanageChild(w);
 {
     // close the dialog
     XtUnmanageChild(w);


@@ -58,29 +66,29 @@ static void msgboxCallBack(Widget w, int client_data, int id)
 }
 
 static void msgboxCallBackOk(Widget w,
 }
 
 static void msgboxCallBackOk(Widget w,

-                             int client_data,
-                             XmAnyCallbackStruct *call_data)
+                             void* client_data,
+                             XmAnyCallbackStruct *WXUNUSED(call_data))

 {
     msgboxCallBack(w, client_data, wxID_OK);
 }
 
 static void msgboxCallBackCancel(Widget w,
 {
     msgboxCallBack(w, client_data, wxID_OK);
 }
 
 static void msgboxCallBackCancel(Widget w,

-                                 int client_data,
-                                 XmAnyCallbackStruct *call_data)
+                                 void* client_data,
+                                 XmAnyCallbackStruct *WXUNUSED(call_data))

 {
     msgboxCallBack(w, client_data, wxID_CANCEL);
 }
 
 static void msgboxCallBackHelp(Widget w,
 {
     msgboxCallBack(w, client_data, wxID_CANCEL);
 }
 
 static void msgboxCallBackHelp(Widget w,

-                               int client_data,
-                               XmAnyCallbackStruct *call_data)
+                               void* client_data,
+                               XmAnyCallbackStruct *WXUNUSED(call_data))

 {
     msgboxCallBack(w, client_data, wxID_HELP);
 }
 
 static void msgboxCallBackClose(Widget w,
 {
     msgboxCallBack(w, client_data, wxID_HELP);
 }
 
 static void msgboxCallBackClose(Widget w,

-                                int client_data,
-                                XmAnyCallbackStruct *call_data)
+                                void* client_data,
+                                XmAnyCallbackStruct *WXUNUSED(call_data))

 {
     msgboxCallBack(w, client_data, wxID_CANCEL);
 }
 {
     msgboxCallBack(w, client_data, wxID_CANCEL);
 }


@@ -93,7 +101,7 @@ wxMessageDialog::wxMessageDialog(wxWindow *parent,
                                  const wxString& message,
                                  const wxString& caption,
                                  long style,
                                  const wxString& message,
                                  const wxString& caption,
                                  long style,

-                                 const wxPoint& pos)
+                                 const wxPoint& WXUNUSED(pos))

 {
     m_caption = caption;
     m_message = message;
 {
     m_caption = caption;
     m_message = message;


@@ -125,17 +133,7 @@ int wxMessageDialog::ShowModal()
         dialogCreateFunction = XmCreateInformationDialog;
     }
 
         dialogCreateFunction = XmCreateInformationDialog;
     }
 

-    // prepare the arg list
-    Arg args[2];
-    int ac = 0;
-
-    wxXmString text(m_message);
-    wxXmString title(m_caption);
-    XtSetArg(args[ac], XmNmessageString, text()); ac++;
-    XtSetArg(args[ac], XmNdialogTitle, title()); ac++;
-
-    // do create message box
-    Widget wParent = m_parent ? GetWidget(m_parent) : NULL;
+    Widget wParent = m_parent ? GetWidget(m_parent) : (Widget) 0;

     if ( !wParent )
     {
         wxWindow *window = wxTheApp->GetTopWindow();
     if ( !wParent )
     {
         wxWindow *window = wxTheApp->GetTopWindow();


@@ -149,6 +147,25 @@ int wxMessageDialog::ShowModal()
         wParent = GetWidget(window);
     }
 
         wParent = GetWidget(window);
     }
 

+    // prepare the arg list
+    Arg args[10];
+    int ac = 0;
+
+    wxXmString text(m_message);
+    wxXmString title(m_caption);
+    XtSetArg(args[ac], XmNmessageString, text()); ac++;
+    XtSetArg(args[ac], XmNdialogTitle, title()); ac++;
+
+    wxComputeColours (XtDisplay(wParent), & 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++;
+
+    // do create message box
+

     Widget wMsgBox = (*dialogCreateFunction)(wParent, "", args, ac);
 
     wxCHECK_MSG( wMsgBox, wxID_CANCEL, "msg box creation failed" );
     Widget wMsgBox = (*dialogCreateFunction)(wParent, "", args, ac);
 
     wxCHECK_MSG( wMsgBox, wxID_CANCEL, "msg box creation failed" );