added pragmas to disable icc warning when va_arg is used with a pointer type

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

diff --git a/src/motif/dialog.cpp b/src/motif/dialog.cpp
index 4be633c308e1167281f0ba88a96b30c5bce6351c..0b812eadba4a4bd01c9b8ef9613ca964903f8bc5 100644 (file)
--- a/src/motif/dialog.cpp
+++ b/src/motif/dialog.cpp
@@ -9,10 +9,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

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

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


@@ -151,7 +147,7 @@ bool wxDialog::Create(wxWindow *parent, wxWindowID id,
     return true;
 }
 
     return true;
 }
 

-bool wxDialog::DoCreate(wxWindow* parent,
+bool wxDialog::XmDoCreateTLW(wxWindow* parent,

                              wxWindowID id,
                              const wxString& title,
                              const wxPoint& pos,
                              wxWindowID id,
                              const wxString& title,
                              const wxPoint& pos,


@@ -370,6 +366,8 @@ void wxDialog::EndModal(int retCode)
 
     m_modalShowing = false;
     m_eventLoop->Exit();
 
     m_modalShowing = false;
     m_eventLoop->Exit();

+
+    SetModal(false);

 }
 
 // Standard buttons
 }
 
 // Standard buttons