Large image-loading speedup and small attribute-loading speedup

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

diff --git a/src/motif/dialog.cpp b/src/motif/dialog.cpp
index 95abbae57c29cdab13a46a4ac20df4a03cbc214f..618c22de04929b8134d8d406abf8d6738ea5cddb 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"
 
-#ifdef __VMS
-#define XtDisplay XTDISPLAY
-#define XtWindow XTWINDOW
-#define XtParent XTPARENT
-#define XtScreen XTSCREEN
-#endif
-
 #include "wx/dialog.h"
 
 #ifndef WX_PRECOMP
@@ -188,7 +181,10 @@ void wxDialog::SetModal(bool flag)
 
 wxDialog::~wxDialog()
 {
-    m_isBeingDeleted = true;
+    SendDestroyEvent();
+
+    // if the dialog is modal, this will end its event loop
+    Show(false);
 
     delete m_eventLoop;
 
@@ -248,10 +244,16 @@ bool wxDialog::Show( bool show )
     if( !wxWindowBase::Show( show ) )
         return false;
 
+    if ( !show && IsModal() )
+        EndModal(wxID_CANCEL);
+
     m_isShown = show;
 
     if (show)
     {
+        if (CanDoLayoutAdaptation())
+            DoLayoutAdaptation();
+
         // this usually will result in TransferDataToWindow() being called
         // which will change the controls values so do it before showing as
         // otherwise we could have some flicker
@@ -305,8 +307,7 @@ int wxDialog::ShowModal()
     // Now process all events in case they get sent to a destroyed dialog
     wxFlushEvents( display );
 
-    delete m_eventLoop;
-    m_eventLoop = NULL;
+    wxDELETE(m_eventLoop);
 
     // TODO: is it safe to call this, if the dialog may have been deleted
     // by now? Probably only if we're using delayed deletion of dialogs.