X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dfdc483a235dae40290f4f3a69d1f41db6797609..f31bbefd1070af6162b9deeda9d4e528efbc1b31:/src/gtk1/dialog.cpp diff --git a/src/gtk1/dialog.cpp b/src/gtk1/dialog.cpp index 31df13df6b..5a1129b0e2 100644 --- a/src/gtk1/dialog.cpp +++ b/src/gtk1/dialog.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: dialog.cpp +// Name: src/gtk1/dialog.cpp // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -11,16 +11,20 @@ #include "wx/wxprec.h" #include "wx/dialog.h" -#include "wx/frame.h" -#include "wx/app.h" -#include "wx/cursor.h" + +#ifndef WX_PRECOMP + #include "wx/app.h" + #include "wx/frame.h" + #include "wx/cursor.h" +#endif // WX_PRECOMP + #include "wx/evtloop.h" #include #include #include -#include "wx/gtk/win_gtk.h" +#include "wx/gtk1/win_gtk.h" //----------------------------------------------------------------------------- // global data @@ -190,7 +194,7 @@ int wxDialog::ShowModal() wxWindow *parent = wxTheApp->GetTopWindow(); if ( parent && parent != this && - parent->IsBeingDeleted() && + !parent->IsBeingDeleted() && !(parent->GetExtraStyle() & wxWS_EX_TRANSIENT) ) { m_parent = parent;