AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

don't terminate the event loop in EndModal() if it was already terminated because of an exception thrown inside it (#9838)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55115 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2008-08-18 11:51:53 +00:00
parent 42561c3caf
commit bfafa6288f
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/gtk/dialog.h
View File

@ -11,6 +11,8 @@
#ifndef __GTKDIALOGH__
#define __GTKDIALOGH__
class WXDLLIMPEXP_FWD_CORE wxGUIEventLoop;
//-----------------------------------------------------------------------------
// wxDialog
//-----------------------------------------------------------------------------
@ -47,7 +49,7 @@ public:
private:
// common part of all ctors
void Init();
wxGUIEventLoop *m_modalLoop;
DECLARE_DYNAMIC_CLASS(wxDialog)
};

17
src/gtk/dialog.cpp
View File

@ -18,11 +18,16 @@
#include "wx/evtloop.h"
#include "wx/ptr_scpd.h"
#include <gtk/gtk.h>
// this is defined in src/gtk/toplevel.cpp
extern int wxOpenModalDialogsCount;
wxDEFINE_TIED_SCOPED_PTR_TYPE(wxGUIEventLoop);
//-----------------------------------------------------------------------------
// wxDialog
//-----------------------------------------------------------------------------
@ -31,6 +36,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxDialog,wxTopLevelWindow)
void wxDialog::Init()
{
m_modalLoop = NULL;
m_returnCode = 0;
m_modalShowing = false;
m_themeEnabled = true;
@ -130,7 +136,11 @@ int wxDialog::ShowModal()
// 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);
@ -151,7 +161,10 @@ void wxDialog::EndModal( int retCode )
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 );
}