X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/15f37147958a61adb54e0d64c82dc7b93c1f1cbe..cb41a69b152026d6c586d21148e34913291cd733:/src/cocoa/dialog.mm diff --git a/src/cocoa/dialog.mm b/src/cocoa/dialog.mm index 1f412b0a33..8782dfab33 100644 --- a/src/cocoa/dialog.mm +++ b/src/cocoa/dialog.mm @@ -4,9 +4,8 @@ // Author: David Elliott // Modified by: // Created: 2002/12/15 -// RCS-ID: $Id$ // Copyright: 2002 David Elliott -// Licence: wxWidgets licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #include "wx/wxprec.h" @@ -19,6 +18,7 @@ #include "wx/settings.h" #endif //WX_PRECOMP +#include "wx/modalhook.h" #include "wx/cocoa/autorelease.h" #include "wx/cocoa/string.h" @@ -99,6 +99,10 @@ bool wxDialog::Show(bool show) if(show) { wxAutoNSAutoreleasePool pool; + + if (CanDoLayoutAdaptation()) + DoLayoutAdaptation(); + InitDialog(); if(IsModal()) { // ShowModal() will show the dialog @@ -123,6 +127,8 @@ bool wxDialog::Show(bool show) // is stopped (via EndModal()) it returns the exit code. int wxDialog::ShowModal() { + WX_HOOK_MODAL_DIALOG(); + wxCHECK_MSG(!IsModal(),GetReturnCode(),wxT("wxDialog::ShowModal called within its own modal loop")); // Show(true) will set m_isShown = true