X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9a83f860948059b0273b5cc6d9e43fadad3ebfca..bfdaa9173ed5b20dd5a9cd83241ce44fc0eff960:/src/univ/dialog.cpp?ds=inline

diff --git a/src/univ/dialog.cpp b/src/univ/dialog.cpp
index f0f3d659c2..f12d20baa1 100644
--- a/src/univ/dialog.cpp
+++ b/src/univ/dialog.cpp
@@ -1,7 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        src/univ/dialog.cpp
 // Author:      Robert Roebling, Vaclav Slavik
-// Id:          $Id$
 // Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -29,6 +28,7 @@
 #endif
 
 #include "wx/evtloop.h"
+#include "wx/modalhook.h"
 
 //-----------------------------------------------------------------------------
 // wxDialog
@@ -41,8 +41,6 @@ BEGIN_EVENT_TABLE(wxDialog,wxDialogBase)
     EVT_CLOSE   (wxDialog::OnCloseWindow)
 END_EVENT_TABLE()
 
-IMPLEMENT_DYNAMIC_CLASS(wxDialog,wxTopLevelWindow)
-
 void wxDialog::Init()
 {
     m_returnCode = 0;
@@ -130,7 +128,7 @@ void wxDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
 
     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);
@@ -143,11 +141,7 @@ bool wxDialog::Show(bool show)
         // if we had disabled other app windows, reenable them back now because
         // if they stay disabled Windows will activate another window (one
         // which is enabled, anyhow) and we will lose activation
-        if ( m_windowDisabler )
-        {
-            delete m_windowDisabler;
-            m_windowDisabler = NULL;
-        }
+        wxDELETE(m_windowDisabler);
 
         if ( IsModal() )
             EndModal(wxID_CANCEL);
@@ -171,6 +165,8 @@ bool wxDialog::IsModal() const
 
 int wxDialog::ShowModal()
 {
+    WX_HOOK_MODAL_DIALOG();
+
     if ( IsModal() )
     {
        wxFAIL_MSG( wxT("wxDialog:ShowModal called twice") );
@@ -179,13 +175,10 @@ int wxDialog::ShowModal()
 
     // 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 && parent != this )
     {
-        wxWindow * const parent = GetParentForModalDialog();
-        if ( parent && parent != this )
-        {
-            m_parent = parent;
-        }
+        m_parent = parent;
     }
 
     Show(true);
@@ -194,9 +187,8 @@ int wxDialog::ShowModal()
 
     wxASSERT_MSG( !m_windowDisabler, wxT("disabling windows twice?") );
 
-#if defined(__WXGTK__) || defined(__WXMGL__)
+#if defined(__WXGTK__)
     wxBusyCursorSuspender suspender;
-    // FIXME (FIXME_MGL) - make sure busy cursor disappears under MSW too
 #endif
 
     m_windowDisabler = new wxWindowDisabler(this);