X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b22d16ad20a51052d24d538c22237c97b0ee0b53..cd560c961a09a8ae80b9c32856e195ed784cc547:/src/univ/dialog.cpp?ds=sidebyside diff --git a/src/univ/dialog.cpp b/src/univ/dialog.cpp index 4116e83c3d..cf1d19793b 100644 --- a/src/univ/dialog.cpp +++ b/src/univ/dialog.cpp @@ -153,6 +153,18 @@ bool wxDialog::Show(bool show) EndModal(wxID_CANCEL); } + // Not sure how to put this in platform-specific + // code just yet. Nano-X has to force a size event, + // else there's no initial size. +#if wxUSE_NANOX + if (show) + { + wxSizeEvent event(GetSize(), GetId()); + event.SetEventObject(this); + GetEventHandler()->ProcessEvent(event); + } +#endif + bool ret = wxDialogBase::Show(show); if ( show ) @@ -196,9 +208,9 @@ int wxDialog::ShowModal() wxASSERT_MSG( !m_windowDisabler, _T("disabling windows twice?") ); -#ifdef __WXGTK__ +#if defined(__WXGTK__) || defined(__WXMGL__) wxBusyCursorSuspender suspender; - // FIXME - make sure busy cursor disappears under MSW too + // FIXME (FIXME_MGL) - make sure busy cursor disappears under MSW too #endif m_windowDisabler = new wxWindowDisabler(this);