Neither PocketPC nor SmartPhone have SHBrowseForFolder

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30863 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/dirdlg.h b/include/wx/dirdlg.h
index d2d38c0bdde9ed57485f5d72681f99916cc050f7..83c9ed5ea839e8e1cc6e8bd8b0725e47a19d819a 100644 (file)
--- a/include/wx/dirdlg.h
+++ b/include/wx/dirdlg.h
@@ -51,8 +51,8 @@ public:
     #include "wx/generic/dirdlgg.h"
     #define wxDirDialog wxGenericDirDialog
 
-// MS Smartphone
-#elif defined(__SMARTPHONE__) && defined(__WXWINCE__)
+// MS PocketPC or MS Smartphone
+#elif defined(__WXMSW__) && defined(__WXWINCE__) && !defined(__HANDHELDPC__)
 
     #include "wx/generic/dirdlgg.h"
     #define wxDirDialog wxGenericDirDialog

diff --git a/src/msw/dirdlg.cpp b/src/msw/dirdlg.cpp
index 0bb55362d5586f8a68f9f5f8c754182a625aadbe..f01131140705d4b517aa9271746fcac28f294efb 100644 (file)
--- a/src/msw/dirdlg.cpp
+++ b/src/msw/dirdlg.cpp
@@ -28,7 +28,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_DIRDLG && !(defined(__SMARTPHONE__) && defined(__WXWINCE__))
+#if wxUSE_DIRDLG && (!defined(__WXWINCE__) || defined(__HANDHELDPC__))
 
 #if defined(__WIN95__) && !defined(__GNUWIN32_OLD__) && wxUSE_OLE