missing commit

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

diff --git a/src/gtk/msgdlg.cpp b/src/gtk/msgdlg.cpp
index b01e51b13e95639306c7c1f508b4b20fc2fcc575..6d1104ae6272f90466f67d11b19d9885180b5001 100644 (file)
--- a/src/gtk/msgdlg.cpp
+++ b/src/gtk/msgdlg.cpp
@@ -24,12 +24,13 @@
     #include "wx/intl.h"
 #endif
 
     #include "wx/intl.h"
 #endif
 

-#include "wx/testing.h"
+#include "wx/modalhook.h"

 
 #include <gtk/gtk.h>
 #include "wx/gtk/private.h"
 #include "wx/gtk/private/messagetype.h"
 #include "wx/gtk/private/mnemonics.h"
 
 #include <gtk/gtk.h>
 #include "wx/gtk/private.h"
 #include "wx/gtk/private/messagetype.h"
 #include "wx/gtk/private/mnemonics.h"

+#include "wx/gtk/private/dialogcount.h"

 
 #if wxUSE_LIBHILDON
     #include <hildon-widgets/hildon-note.h>
 
 #if wxUSE_LIBHILDON
     #include <hildon-widgets/hildon-note.h>


@@ -275,7 +276,7 @@ void wxMessageDialog::GTKCreateMsgDialog()
 
 int wxMessageDialog::ShowModal()
 {
 
 int wxMessageDialog::ShowModal()
 {

-    WX_TESTING_SHOW_MODAL_HOOK();
+    WX_HOOK_MODAL_DIALOG();

 
     // break the mouse capture as it would interfere with modal dialog (see
     // wxDialog::ShowModal)
 
     // break the mouse capture as it would interfere with modal dialog (see
     // wxDialog::ShowModal)


@@ -295,6 +296,8 @@ int wxMessageDialog::ShowModal()
     if (m_parent)
         gtk_window_present( GTK_WINDOW(m_parent->m_widget) );
 
     if (m_parent)
         gtk_window_present( GTK_WINDOW(m_parent->m_widget) );
 

+    wxOpenModalDialogLocker modalLocker;
+

     gint result = gtk_dialog_run(GTK_DIALOG(m_widget));
     GTKDisconnect(m_widget);
     gtk_widget_destroy(m_widget);
     gint result = gtk_dialog_run(GTK_DIALOG(m_widget));
     GTKDisconnect(m_widget);
     gtk_widget_destroy(m_widget);