X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7398fb817080494ac72bba20bcbc3d3b741e7e48..88c139da4639cd25e4ad1298062e1e8b19ee29f1:/src/motif/msgdlg.cpp?ds=sidebyside diff --git a/src/motif/msgdlg.cpp b/src/motif/msgdlg.cpp index 63ea92e899..f51da838f1 100644 --- a/src/motif/msgdlg.cpp +++ b/src/motif/msgdlg.cpp @@ -13,10 +13,6 @@ // declarations // ============================================================================ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "msgdlg.h" -#endif - // ---------------------------------------------------------------------------- // headers // ---------------------------------------------------------------------------- @@ -29,7 +25,7 @@ #ifdef __VMS #define XtDisplay XTDISPLAY #pragma message disable nosimpint -#include +#include "wx/vms_x_fix.h" #endif #include @@ -113,11 +109,16 @@ wxMessageDialog::wxMessageDialog(wxWindow *parent, SetMessageDialogStyle(style); } +extern "C" +{ + typedef Widget (*DialogCreateFunction)(Widget, String, ArgList, Cardinal); +} + int wxMessageDialog::ShowModal() { - Widget (*dialogCreateFunction)(Widget, String, ArgList, Cardinal) = NULL; const long style = GetMessageDialogStyle(); + DialogCreateFunction dialogCreateFunction; if ( style & wxYES_NO ) { // if we have [Yes], it must be a question @@ -185,7 +186,7 @@ int wxMessageDialog::ShowModal() // 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" ); @@ -266,4 +267,3 @@ int wxMessageDialog::ShowModal() return m_result; } -