X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5276b0a53cef4815230e39b54d2ecda14f72cbd1..907f5902b38403caaeb5e60351c145be6295e336:/src/univ/dialog.cpp diff --git a/src/univ/dialog.cpp b/src/univ/dialog.cpp index fbb8423f7b..b698e2a678 100644 --- a/src/univ/dialog.cpp +++ b/src/univ/dialog.cpp @@ -29,6 +29,7 @@ #endif #include "wx/evtloop.h" +#include "wx/testing.h" //----------------------------------------------------------------------------- // wxDialog @@ -41,8 +42,6 @@ BEGIN_EVENT_TABLE(wxDialog,wxDialogBase) EVT_CLOSE (wxDialog::OnCloseWindow) END_EVENT_TABLE() -IMPLEMENT_DYNAMIC_CLASS(wxDialog,wxTopLevelWindow) - void wxDialog::Init() { m_returnCode = 0; @@ -167,6 +166,8 @@ bool wxDialog::IsModal() const int wxDialog::ShowModal() { + WX_TESTING_SHOW_MODAL_HOOK(); + if ( IsModal() ) { wxFAIL_MSG( wxT("wxDialog:ShowModal called twice") ); @@ -187,9 +188,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);