X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cdc48273b49b0b90d9587a1ecc5935d38a160620..64ea838d8f4d1853b7d850db93ee565e901d099a:/src/univ/dialog.cpp?ds=inline diff --git a/src/univ/dialog.cpp b/src/univ/dialog.cpp index c0f69439b7..c8b9e7aa7d 100644 --- a/src/univ/dialog.cpp +++ b/src/univ/dialog.cpp @@ -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; @@ -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); @@ -191,9 +185,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);