Test whether GTK+ is 2.18 or newer in configure.

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

diff --git a/src/univ/dialog.cpp b/src/univ/dialog.cpp
index ad510bd277abc02c0f456bace842cfffeb194d5a..f0f3d659c228c50bff92c392ada6356fce8a08e4 100644 (file)
--- a/src/univ/dialog.cpp
+++ b/src/univ/dialog.cpp
@@ -53,6 +53,9 @@ void wxDialog::Init()
 
 wxDialog::~wxDialog()
 {
+    // if the dialog is modal, this will end its event loop
+    Show(false);
+
     delete m_eventLoop;
 }
 
@@ -189,7 +192,7 @@ int wxDialog::ShowModal()
 
     m_isShowingModal = true;
 
-    wxASSERT_MSG( !m_windowDisabler, _T("disabling windows twice?") );
+    wxASSERT_MSG( !m_windowDisabler, wxT("disabling windows twice?") );
 
 #if defined(__WXGTK__) || defined(__WXMGL__)
     wxBusyCursorSuspender suspender;
@@ -207,7 +210,7 @@ int wxDialog::ShowModal()
 
 void wxDialog::EndModal(int retCode)
 {
-    wxASSERT_MSG( m_eventLoop, _T("wxDialog is not modal") );
+    wxASSERT_MSG( m_eventLoop, wxT("wxDialog is not modal") );
 
     SetReturnCode(retCode);