Applied patch [ 1427626 ] Fix wxFileConfig so that it still works after DeleteAll()

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

diff --git a/src/motif/msgdlg.cpp b/src/motif/msgdlg.cpp
index 63ea92e899dcc314031d0ac52ba5b31441c16550..f51da838f19b7faf09e604adef42d9edcc939939 100644 (file)
--- a/src/motif/msgdlg.cpp
+++ b/src/motif/msgdlg.cpp
@@ -13,10 +13,6 @@
 // declarations
 // ============================================================================
 
 // declarations
 // ============================================================================
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "msgdlg.h"
-#endif
-

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


@@ -29,7 +25,7 @@
 #ifdef __VMS
 #define XtDisplay XTDISPLAY
 #pragma message disable nosimpint
 #ifdef __VMS
 #define XtDisplay XTDISPLAY
 #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>
 


@@ -113,11 +109,16 @@ wxMessageDialog::wxMessageDialog(wxWindow *parent,
     SetMessageDialogStyle(style);
 }
 
     SetMessageDialogStyle(style);
 }
 

+extern "C"
+{
+    typedef Widget (*DialogCreateFunction)(Widget, String, ArgList, Cardinal);
+}
+

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

-    Widget (*dialogCreateFunction)(Widget, String, ArgList, Cardinal) = NULL;

     const long style = GetMessageDialogStyle();
 
     const long style = GetMessageDialogStyle();
 

+    DialogCreateFunction dialogCreateFunction;

     if ( style & wxYES_NO )
     {
         // if we have [Yes], it must be a question
     if ( style & wxYES_NO )
     {
         // if we have [Yes], it must be a question


@@ -185,7 +186,7 @@ int wxMessageDialog::ShowModal()
 
     // 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" );
 


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

-