Made changes to allow build with new mingw32/gcc-2.95

added wxUSE_NORLANDER_HEADERS for mingw32/gcc-2.95 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3258 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-08-04 00:42:51 +00:00
parent ea8fe90e65
commit 65fd5cb012
34 changed files with 68 additions and 33 deletions
--- a/src/msw/registry.cpp
+++ b/src/msw/registry.cpp
@@ -302,7 +302,7 @@ wxString wxRegKey::GetName(bool bShortPrefix) const
  return str;
 }

-#ifdef __GNUWIN32__
+#if defined( __GNUWIN32__ ) && !defined(wxUSE_NORLANDER_HEADERS)
 bool wxRegKey::GetKeyInfo(size_t* pnSubKeys,
                          size_t* pnMaxKeyLen,
                          size_t* pnValues,