many changes; major ones:

[wxWidgets.git] / include / wx / msw / registry.h

diff --git a/include/wx/msw/registry.h b/include/wx/msw/registry.h
index 693207b3fd31a4c6f9d2a4ab69ab6ee3b9568136..958b78c878df9fd6e4040a734577c875b5b907f4 100644 (file)
--- a/include/wx/msw/registry.h
+++ b/include/wx/msw/registry.h
@@ -125,7 +125,7 @@ public:
   bool  Exists() const;
     // get the info about key (any number of these pointers may be NULL)
 
   bool  Exists() const;
     // get the info about key (any number of these pointers may be NULL)
 

-#ifdef __GNUWIN32__
+#if defined( __GNUWIN32__) && !defined(wxUSE_NORLANDER_HEADERS)

   bool  GetKeyInfo(size_t *pnSubKeys,      // number of subkeys
                    size_t *pnMaxKeyLen,    // max len of subkey name
                    size_t *pnValues,       // number of values
   bool  GetKeyInfo(size_t *pnSubKeys,      // number of subkeys
                    size_t *pnMaxKeyLen,    // max len of subkey name
                    size_t *pnValues,       // number of values