#include "wx/evtloop.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)
+
+
//-----------------------------------------------------------------------------
// wxDialog
//-----------------------------------------------------------------------------
-IMPLEMENT_DYNAMIC_CLASS(wxDialog,wxTopLevelWindow)
-
void wxDialog::Init()
{
+ m_modalLoop = NULL;
m_returnCode = 0;
m_modalShowing = false;
m_themeEnabled = true;
wxDialog::~wxDialog()
{
- m_isBeingDeleted = true;
-
// if the dialog is modal, this will end its event loop
if ( IsModal() )
EndModal(wxID_CANCEL);
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
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
// NOTE: gtk_window_set_modal internally calls gtk_grab_add() !
gtk_window_set_modal(GTK_WINDOW(m_widget), TRUE);
- wxGUIEventLoop().Run();
+ // Run modal dialog event loop.
+ {
+ wxGUIEventLoopTiedPtr modal(&m_modalLoop, new wxGUIEventLoop());
+ m_modalLoop->Run();
+ }
gtk_window_set_modal(GTK_WINDOW(m_widget), FALSE);
m_modalShowing = false;
- gtk_main_quit();
+ // Ensure Exit() is only called once. The dialog's event loop may be terminated
+ // externally due to an uncaught exception.
+ if (m_modalLoop && m_modalLoop->IsRunning())
+ m_modalLoop->Exit();
Show( false );
}