X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2e9f62dafb75dc5baa3800af456d1b0248d85357..9f7948af90ec2e3b907944e7d979f0863910c5c8:/src/univ/dialog.cpp diff --git a/src/univ/dialog.cpp b/src/univ/dialog.cpp index 0f5bd56000..40b3f7efe8 100644 --- a/src/univ/dialog.cpp +++ b/src/univ/dialog.cpp @@ -14,7 +14,7 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "univdialog.h" #endif @@ -166,11 +166,6 @@ bool wxDialog::IsModal() const return m_isShowingModal; } -void wxDialog::SetModal(bool WXUNUSED(flag)) -{ - wxFAIL_MSG( wxT("wxDialog:SetModal obsolete now") ); -} - int wxDialog::ShowModal() { if ( IsModal() ) @@ -190,14 +185,17 @@ int wxDialog::ShowModal() } } - wxBusyCursorSuspender cs; // temporarily suppress the busy cursor - Show(TRUE); m_isShowingModal = TRUE; wxASSERT_MSG( !m_windowDisabler, _T("disabling windows twice?") ); +#if defined(__WXGTK__) || defined(__WXMGL__) + wxBusyCursorSuspender suspender; + // FIXME (FIXME_MGL) - make sure busy cursor disappears under MSW too +#endif + m_windowDisabler = new wxWindowDisabler(this); if ( !m_eventLoop ) m_eventLoop = new wxEventLoop;