Fix broken and missing DataView interface items for Phoenix

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

diff --git a/src/gtk/dialog.cpp b/src/gtk/dialog.cpp
index 2a2e83a0e00fd90db3079fe7ea92588dbdc8200a..4cf2730f9c3854d099d2af3a82771397c1959f77 100644 (file)
--- a/src/gtk/dialog.cpp
+++ b/src/gtk/dialog.cpp
@@ -19,6 +19,7 @@
 #include "wx/evtloop.h"
 
 #include "wx/scopedptr.h"
 #include "wx/evtloop.h"
 
 #include "wx/scopedptr.h"

+#include "wx/testing.h"

 
 #include <gtk/gtk.h>
 
 
 #include <gtk/gtk.h>
 


@@ -32,8 +33,6 @@ wxDEFINE_TIED_SCOPED_PTR_TYPE(wxGUIEventLoop)
 // wxDialog
 //-----------------------------------------------------------------------------
 
 // wxDialog
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxDialog,wxTopLevelWindow)
-

 void wxDialog::Init()
 {
     m_modalLoop = NULL;
 void wxDialog::Init()
 {
     m_modalLoop = NULL;


@@ -102,6 +101,8 @@ void wxDialog::SetModal( bool WXUNUSED(flag) )
 
 int wxDialog::ShowModal()
 {
 
 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
     wxASSERT_MSG( !IsModal(), "ShowModal() can't be called twice" );
 
     // release the mouse if it's currently captured as the window having it


@@ -111,16 +112,11 @@ int wxDialog::ShowModal()
     if ( win )
         win->GTKReleaseMouseAndNotify();
 
     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
     }
 
     wxBusyCursorSuspender cs; // temporarily suppress the busy cursor