fixing infinite recursion for rotated text, introduced in cleanup r57915

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

diff --git a/src/motif/dialog.cpp b/src/motif/dialog.cpp
index 59b8baf0778348fa97b3de240586a41727de2e0a..3955a68d4536e6385f011764ffde4e670c3f7e42 100644 (file)
--- a/src/motif/dialog.cpp
+++ b/src/motif/dialog.cpp
@@ -12,13 +12,6 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

-#ifdef __VMS
-#define XtDisplay XTDISPLAY
-#define XtWindow XTWINDOW
-#define XtParent XTPARENT
-#define XtScreen XTSCREEN
-#endif
-

 #include "wx/dialog.h"
 
 #ifndef WX_PRECOMP
 #include "wx/dialog.h"
 
 #ifndef WX_PRECOMP


@@ -190,6 +183,9 @@ wxDialog::~wxDialog()
 {
     m_isBeingDeleted = true;
 
 {
     m_isBeingDeleted = true;
 

+    // if the dialog is modal, this will end its event loop
+    Show(false);
+

     delete m_eventLoop;
 
     if (m_mainWidget)
     delete m_eventLoop;
 
     if (m_mainWidget)


@@ -248,6 +244,9 @@ bool wxDialog::Show( bool show )
     if( !wxWindowBase::Show( show ) )
         return false;
 
     if( !wxWindowBase::Show( show ) )
         return false;
 

+    if ( !show && IsModal() )
+        EndModal(wxID_CANCEL);
+

     m_isShown = show;
 
     if (show)
     m_isShown = show;
 
     if (show)