X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bfafa6288ffea13f3653610de52ebe5cb609f468..b3ee9f4d2efa4a5088b4c84eb8a0ba712fa7e7fb:/src/gtk/dialog.cpp

diff --git a/src/gtk/dialog.cpp b/src/gtk/dialog.cpp
index d9d6dd1e9c..4cf2730f9c 100644
--- a/src/gtk/dialog.cpp
+++ b/src/gtk/dialog.cpp
@@ -18,22 +18,21 @@
 
 #include "wx/evtloop.h"
 
-#include "wx/ptr_scpd.h"
+#include "wx/scopedptr.h"
+#include "wx/testing.h"
 
 #include <gtk/gtk.h>
 
 // this is defined in src/gtk/toplevel.cpp
 extern int wxOpenModalDialogsCount;
 
-wxDEFINE_TIED_SCOPED_PTR_TYPE(wxGUIEventLoop);
+wxDEFINE_TIED_SCOPED_PTR_TYPE(wxGUIEventLoop)
 
 
 //-----------------------------------------------------------------------------
 // wxDialog
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxDialog,wxTopLevelWindow)
-
 void wxDialog::Init()
 {
     m_modalLoop = NULL;
@@ -85,8 +84,6 @@ bool wxDialog::Show( bool show )
 
 wxDialog::~wxDialog()
 {
-    m_isBeingDeleted = true;
-
     // if the dialog is modal, this will end its event loop
     if ( IsModal() )
         EndModal(wxID_CANCEL);
@@ -104,6 +101,8 @@ void wxDialog::SetModal( bool WXUNUSED(flag) )
 
 int wxDialog::ShowModal()
 {
+    WX_TESTING_SHOW_MODAL_HOOK();
+
     wxASSERT_MSG( !IsModal(), "ShowModal() can't be called twice" );
 
     // release the mouse if it's currently captured as the window having it
@@ -113,16 +112,11 @@ int wxDialog::ShowModal()
     if ( win )
         win->GTKReleaseMouseAndNotify();
 
-    // use the apps top level window as parent if none given unless explicitly
-    // forbidden
-    if ( !GetParent() && !(GetWindowStyleFlag() & wxDIALOG_NO_PARENT) )
+    wxWindow * const parent = GetParentForModalDialog();
+    if ( parent )
     {
-        wxWindow * const parent = GetParentForModalDialog();
-        if ( parent && parent != this )
-        {
-            gtk_window_set_transient_for( GTK_WINDOW(m_widget),
-                                          GTK_WINDOW(parent->m_widget) );
-        }
+        gtk_window_set_transient_for( GTK_WINDOW(m_widget),
+                                      GTK_WINDOW(parent->m_widget) );
     }
 
     wxBusyCursorSuspender cs; // temporarily suppress the busy cursor