From 9afa157d4341b0c30dc5007acbeed1dc129b185b Mon Sep 17 00:00:00 2001
From: Catalin <maildus@gmail.com>
Date: Sun, 21 Feb 2016 12:12:47 +0200
Subject: [PATCH] Marked some standard keys as obsolete. They should probably
 be removed too.

---
 include/wx/msw/registry.h   | 4 ++--
 interface/wx/msw/registry.h | 7 ++++---
 src/msw/registry.cpp        | 8 ++++----
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/include/wx/msw/registry.h b/include/wx/msw/registry.h
index 2c17d36145..f3925f97bf 100644
--- a/include/wx/msw/registry.h
+++ b/include/wx/msw/registry.h
@@ -52,9 +52,9 @@ public:
     HKCU,       // current user
     HKLM,       // local machine
     HKUSR,      // users
-    HKPD,       // performance data (WinNT/2K only)
+    HKPD,       // (obsolete under XP and later)
     HKCC,       // current config
-    HKDD,       // dynamic data (Win95/98 only)
+    HKDD,       // (obsolete under XP and later)
     HKMAX
   };
 
diff --git a/interface/wx/msw/registry.h b/interface/wx/msw/registry.h
index 93311b42e0..52389e165b 100644
--- a/interface/wx/msw/registry.h
+++ b/interface/wx/msw/registry.h
@@ -81,7 +81,8 @@ public:
         WOW64ViewMode viewMode = WOW64ViewMode_Default);
     /**
         The constructor to set the full name of the key using one of the
-        standard keys, that is, HKCR, HKCU, HKLM, HKUSR, HKPD, HKCC or HKDD.
+        standard keys, that is, HKCR, HKCU, HKLM, HKUSR, HKPD (obsolete),
+        HKCC or HKDD (obsolete).
         The @a viewMode parameter is new since wxWidgets 2.9.2.
     */
     wxRegKey(StdKey keyParent, const wxString& strKey,
@@ -110,9 +111,9 @@ public:
     HKCU,  ///< HKEY_CURRENT_USER
     HKLM,  ///< HKEY_LOCAL_MACHINE
     HKUSR, ///< HKEY_USERS
-    HKPD,  ///< HKEY_PERFORMANCE_DATA
+    HKPD,  ///< HKEY_PERFORMANCE_DATA (Obsolete under XP and later)
     HKCC,  ///< HKEY_CURRENT_CONFIG
-    HKDD,  ///< HKEY_DYN_DATA (Obsolete)
+    HKDD,  ///< HKEY_DYN_DATA (Obsolete under XP and later)
     HKMAX
     };
 
diff --git a/src/msw/registry.cpp b/src/msw/registry.cpp
index 5936ce0705..a1a24a47d2 100644
--- a/src/msw/registry.cpp
+++ b/src/msw/registry.cpp
@@ -49,7 +49,7 @@
 typedef unsigned char *RegString;
 typedef BYTE* RegBinary;
 
-#ifndef HKEY_PERFORMANCE_DATA
+#ifndef HKEY_PERFORMANCE_DATA // (Obsolete under XP and later)
     #define HKEY_PERFORMANCE_DATA ((HKEY)0x80000004)
 #endif
 
@@ -57,7 +57,7 @@ typedef BYTE* RegBinary;
     #define HKEY_CURRENT_CONFIG ((HKEY)0x80000005)
 #endif
 
-#ifndef HKEY_DYN_DATA
+#ifndef HKEY_DYN_DATA // (Obsolete under XP and later)
     #define HKEY_DYN_DATA ((HKEY)0x80000006)
 #endif
 
@@ -83,9 +83,9 @@ aStdKeys[] =
   { HKEY_CURRENT_USER,      wxT("HKEY_CURRENT_USER"),      wxT("HKCU") },
   { HKEY_LOCAL_MACHINE,     wxT("HKEY_LOCAL_MACHINE"),     wxT("HKLM") },
   { HKEY_USERS,             wxT("HKEY_USERS"),             wxT("HKU")  }, // short name?
-  { HKEY_PERFORMANCE_DATA,  wxT("HKEY_PERFORMANCE_DATA"),  wxT("HKPD") },
+  { HKEY_PERFORMANCE_DATA,  wxT("HKEY_PERFORMANCE_DATA"),  wxT("HKPD") }, // (Obsolete under XP and later)
   { HKEY_CURRENT_CONFIG,    wxT("HKEY_CURRENT_CONFIG"),    wxT("HKCC") },
-  { HKEY_DYN_DATA,          wxT("HKEY_DYN_DATA"),          wxT("HKDD") }, // short name?
+  { HKEY_DYN_DATA,          wxT("HKEY_DYN_DATA"),          wxT("HKDD") }, // (Obsolete under XP and later)
 };
 
 // the registry name separator (perhaps one day MS will change it to '/' ;-)