Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

always define our HKPD/CC/DD constants, without using WINVER which is irrelevant anyhow (only run-time version matters, not compile-time)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42865 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-10-31 17:29:55 +00:00
parent 3c49e95272
commit 0bb222915e
2 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
include/wx/msw/registry.h
View File

@@ -48,16 +48,11 @@ public:
HKCR, // classes root HKCR, // classes root
HKCU, // current user HKCU, // current user
HKLM, // local machine HKLM, // local machine
HKUSR // users HKUSR, // users
#ifndef __WXWINCE__ HKPD, // performance data (WinNT/2K only)
, HKCC, // current config
HKPD // performance data (WinNT/2K only) HKDD, // dynamic data (Win95/98 only)
#endif HKMAX
#if WINVER >= 0x0400
,
HKCC, // current config (starting from Win95/NT 4.0)
HKDD // dynamic data (Win95/98 only)
#endif // Winver
}; };
// access mode for the key // access mode for the key

18
src/msw/registry.cpp
View File

@@ -51,6 +51,18 @@
typedef unsigned char *RegString; typedef unsigned char *RegString;
typedef BYTE* RegBinary; typedef BYTE* RegBinary;
#ifndef HKEY_PERFORMANCE_DATA
#define HKEY_PERFORMANCE_DATA ((HKEY)0x80000004)
#endif
#ifndef HKEY_CURRENT_CONFIG
#define HKEY_CURRENT_CONFIG ((HKEY)0x80000005)
#endif
#ifndef HKEY_DYN_DATA
#define HKEY_DYN_DATA ((HKEY)0x80000006)
#endif
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// constants // constants
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@@ -69,15 +81,9 @@ aStdKeys[] =
{ HKEY_CURRENT_USER, wxT("HKEY_CURRENT_USER"), wxT("HKCU") }, { HKEY_CURRENT_USER, wxT("HKEY_CURRENT_USER"), wxT("HKCU") },
{ HKEY_LOCAL_MACHINE, wxT("HKEY_LOCAL_MACHINE"), wxT("HKLM") }, { HKEY_LOCAL_MACHINE, wxT("HKEY_LOCAL_MACHINE"), wxT("HKLM") },
{ HKEY_USERS, wxT("HKEY_USERS"), wxT("HKU") }, // short name? { HKEY_USERS, wxT("HKEY_USERS"), wxT("HKU") }, // short name?
#ifndef __WXWINCE__
{ HKEY_PERFORMANCE_DATA, wxT("HKEY_PERFORMANCE_DATA"), wxT("HKPD") }, { HKEY_PERFORMANCE_DATA, wxT("HKEY_PERFORMANCE_DATA"), wxT("HKPD") },
#endif
#ifdef HKEY_CURRENT_CONFIG
{ HKEY_CURRENT_CONFIG, wxT("HKEY_CURRENT_CONFIG"), wxT("HKCC") }, { HKEY_CURRENT_CONFIG, wxT("HKEY_CURRENT_CONFIG"), wxT("HKCC") },
#endif
#ifdef HKEY_DYN_DATA
{ HKEY_DYN_DATA, wxT("HKEY_DYN_DATA"), wxT("HKDD") }, // short name? { HKEY_DYN_DATA, wxT("HKEY_DYN_DATA"), wxT("HKDD") }, // short name?
#endif
}; };
// the registry name separator (perhaps one day MS will change it to '/' ;-) // the registry name separator (perhaps one day MS will change it to '/' ;-)