From: J. Russell Smyth <drfish@cox.net>
Date: Tue, 14 Sep 1999 20:55:29 +0000 (+0000)
Subject: Changes for mingw32/gcc-2.95
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/6627a4b0497f89221ea9f7848990f8830cf81b7e

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 32505241db..5434b5d0d7 100644
--- 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();