X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/643e9cf9f61fdbe517b15477f9247ca8ac0b3578..84a62bdaa92c49009912f2703516a2a8adbdf04e:/src/msw/dirdlg.cpp diff --git a/src/msw/dirdlg.cpp b/src/msw/dirdlg.cpp index 1760eb8d91..cec2c85b7a 100644 --- a/src/msw/dirdlg.cpp +++ b/src/msw/dirdlg.cpp @@ -4,7 +4,6 @@ // Author: Julian Smart // Modified by: // Created: 01/02/97 -// RCS-ID: $Id$ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -30,7 +29,7 @@ (defined(__HANDHELDPC__) && (_WIN32_WCE >= 500))) #include "wx/dirdlg.h" -#include "wx/testing.h" +#include "wx/modalhook.h" #ifndef WX_PRECOMP #include "wx/utils.h" @@ -106,11 +105,11 @@ struct IModalWindow : public IUnknown #define FOS_FORCEFILESYSTEM 0x40 #endif -struct COMDLG_FILTERSPEC; +struct _COMDLG_FILTERSPEC; struct IFileDialog : public IModalWindow { - virtual HRESULT wxSTDCALL SetFileTypes(UINT, const COMDLG_FILTERSPEC*) = 0; + virtual HRESULT wxSTDCALL SetFileTypes(UINT, const _COMDLG_FILTERSPEC*) = 0; virtual HRESULT wxSTDCALL SetFileTypeIndex(UINT) = 0; virtual HRESULT wxSTDCALL GetFileTypeIndex(UINT*) = 0; virtual HRESULT wxSTDCALL Advise(IFileDialogEvents*, DWORD*) = 0; @@ -221,7 +220,7 @@ void wxDirDialog::SetPath(const wxString& path) int wxDirDialog::ShowModal() { - WX_TESTING_SHOW_MODAL_HOOK(); + WX_HOOK_MODAL_DIALOG(); wxWindow* const parent = GetParent(); WXHWND hWndParent = parent ? GetHwndOf(parent) : NULL;