X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8ce68f7fc03beda6b7cbfdd7180a8f7f7eee952d..4e15d1caa03346c126015019c1fdf093033ef40b:/src/generic/filedlgg.cpp?ds=sidebyside diff --git a/src/generic/filedlgg.cpp b/src/generic/filedlgg.cpp index dc2719db4b..cd2e4da73f 100644 --- a/src/generic/filedlgg.cpp +++ b/src/generic/filedlgg.cpp @@ -19,7 +19,7 @@ #if wxUSE_FILEDLG // NOTE : it probably also supports MAC, untested -#if !defined(__UNIX__) && !defined(__DOS__) && !defined(__WIN32__) && !defined(__OS2__) && !defined(__PALMOS__) +#if !defined(__UNIX__) && !defined(__DOS__) && !defined(__WIN32__) && !defined(__OS2__) #error wxGenericFileDialog currently only supports Unix, win32 and DOS #endif @@ -49,6 +49,7 @@ #include "wx/filectrl.h" #include "wx/generic/filedlgg.h" #include "wx/debug.h" +#include "wx/testing.h" #if wxUSE_TOOLTIPS #include "wx/tooltip.h" @@ -57,7 +58,6 @@ #include "wx/config.h" #endif -#ifndef __WXPALMOS5__ #ifndef __WXWINCE__ #include <sys/types.h> #include <sys/stat.h> @@ -86,7 +86,6 @@ #if defined(__UNIX__) || defined(__DOS__) #include <unistd.h> #endif -#endif // ! __WXPALMOS5__ #if defined(__WXWINCE__) #define IsTopMostDir(dir) (dir == wxT("\\") || dir == wxT("/")) @@ -164,7 +163,7 @@ bool wxGenericFileDialog::Create( wxWindow *parent, { m_bypassGenericImpl = bypassGenericImpl; - parent = GetParentForModalDialog(parent); + parent = GetParentForModalDialog(parent, style); if (!wxFileDialogBase::Create(parent, message, defaultDir, defaultFile, wildCard, style, pos, sz, name)) @@ -310,6 +309,8 @@ wxBitmapButton* wxGenericFileDialog::AddBitmapButton( wxWindowID winId, int wxGenericFileDialog::ShowModal() { + WX_TESTING_SHOW_MODAL_HOOK(); + if (CreateExtraControl()) { wxSizer *sizer = GetSizer();