Fix another crash when conversion fails in Unix PostScript code.

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

diff --git a/src/univ/dialog.cpp b/src/univ/dialog.cpp
index c8b9e7aa7da7a14a741c00374c3e6526dc8338d0..f12d20baa1a95833bd4a8f9a882fee553b46549b 100644 (file)
--- a/src/univ/dialog.cpp
+++ b/src/univ/dialog.cpp
@@ -1,7 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        src/univ/dialog.cpp
 // Author:      Robert Roebling, Vaclav Slavik
 /////////////////////////////////////////////////////////////////////////////
 // Name:        src/univ/dialog.cpp
 // Author:      Robert Roebling, Vaclav Slavik

-// Id:          $Id$

 // Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -29,6 +28,7 @@
 #endif
 
 #include "wx/evtloop.h"
 #endif
 
 #include "wx/evtloop.h"

+#include "wx/modalhook.h"

 
 //-----------------------------------------------------------------------------
 // wxDialog
 
 //-----------------------------------------------------------------------------
 // wxDialog


@@ -128,7 +128,7 @@ void wxDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
 
     s_closing.Append(this);
 
 
     s_closing.Append(this);
 

-    wxCommandEvent cancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
+    wxCommandEvent cancelEvent(wxEVT_BUTTON, wxID_CANCEL);

     cancelEvent.SetEventObject(this);
     GetEventHandler()->ProcessEvent(cancelEvent);
     s_closing.DeleteObject(this);
     cancelEvent.SetEventObject(this);
     GetEventHandler()->ProcessEvent(cancelEvent);
     s_closing.DeleteObject(this);


@@ -165,6 +165,8 @@ bool wxDialog::IsModal() const
 
 int wxDialog::ShowModal()
 {
 
 int wxDialog::ShowModal()
 {

+    WX_HOOK_MODAL_DIALOG();
+

     if ( IsModal() )
     {
        wxFAIL_MSG( wxT("wxDialog:ShowModal called twice") );
     if ( IsModal() )
     {
        wxFAIL_MSG( wxT("wxDialog:ShowModal called twice") );