From 08bce50191228ae4a423b488beedcc8ef1ebb30c Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Wed, 18 Jan 2006 22:02:49 +0000 Subject: [PATCH] Cleanup git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36986 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/msw/dirdlg.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/msw/dirdlg.cpp b/src/msw/dirdlg.cpp index f5288c4597..5f2f111abb 100644 --- a/src/msw/dirdlg.cpp +++ b/src/msw/dirdlg.cpp @@ -24,9 +24,9 @@ #pragma hdrstop #endif -#if wxUSE_DIRDLG && (!defined(__WXWINCE__) || defined(__HANDHELDPC__)) +#if wxUSE_DIRDLG -#if !defined(__GNUWIN32_OLD__) && wxUSE_OLE +#if wxUSE_OLE && !defined(__GNUWIN32_OLD__) && (!defined(__WXWINCE__) || (defined(__HANDHELDPC__) && (_WIN32_WCE >= 500))) #ifndef WX_PRECOMP #include "wx/utils.h" @@ -240,9 +240,7 @@ BrowseCallbackProc(HWND hwnd, UINT uMsg, LPARAM lp, LPARAM pData) return 0; } - -#else - #include "../generic/dirdlgg.cpp" #endif // compiler/platform on which the code here compiles -#endif // wxUSE_DIRDLG && !(__SMARTPHONE__ && __WXWINCE__) +#endif // wxUSE_DIRDLG +