Changes for mingw32/gcc-2.95

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

diff --git a/src/msw/dirdlg.cpp b/src/msw/dirdlg.cpp
index 32505241db2b4d9588021bcbb082b5df2dc5a628..5434b5d0d7a0c2ecc7564b5e38bc7021874d2c27 100644 (file)
--- a/src/msw/dirdlg.cpp
+++ b/src/msw/dirdlg.cpp
@@ -28,7 +28,7 @@
 #include "wx/dirdlg.h"
 #endif
 
-#if defined(__WIN95__) && !defined(__GNUWIN32__)
+#if (defined(__WIN95__) && !defined(__GNUWIN32__))||defined(wxUSE_NORLANDER_HEADERS)
 #include "shlobj.h" // Win95 shell
 #endif
 
@@ -89,7 +89,7 @@ wxDirDialog::wxDirDialog(wxWindow *parent, const wxString& message,
 int wxDirDialog::ShowModal(void)
 {
     // Unfortunately Gnu-Win32 doesn't yet have COM support
-#if defined(__WIN95__) && !defined(__GNUWIN32__)
+#if (defined(__WIN95__) && !defined(__GNUWIN32__))||defined(wxUSE_NORLANDER_HEADERS)
   HWND hWnd = 0;
   if (m_parent) hWnd = (HWND) m_parent->GetHWND();