AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

1. suppressed some messages from HasEntry()/HasKeys()

Browse Source 
2. removed "wxWindows" from default wxRegConfig location


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1116 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 1998-12-05 23:10:04 +00:00
parent 9c9cff0b45
commit c19a8a9a71
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/msw/regconf.cpp
View File

@ -35,7 +35,7 @@
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// we put our data in HKLM\SOFTWARE_KEY\appname // we put our data in HKLM\SOFTWARE_KEY\appname
#define SOFTWARE_KEY wxString("Software\\wxWindows\\") #define SOFTWARE_KEY wxString("Software\\")
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// global functions // global functions

6
src/msw/registry.cpp
View File

@ -522,6 +522,9 @@ bool wxRegKey::HasValue(const char *szValue) const
// returns TRUE if this key has any subkeys // returns TRUE if this key has any subkeys
bool wxRegKey::HasSubkeys() const bool wxRegKey::HasSubkeys() const
{ {
// suppress possible messages from GetFirstKey()
wxLogNull nolog;
// just call GetFirstKey with dummy parameters // just call GetFirstKey with dummy parameters
wxString str; wxString str;
long l; long l;
@ -531,6 +534,9 @@ bool wxRegKey::HasSubkeys() const
// returns TRUE if given subkey exists // returns TRUE if given subkey exists
bool wxRegKey::HasSubKey(const char *szKey) const bool wxRegKey::HasSubKey(const char *szKey) const
{ {
// this function should be silent, so suppress possible messages from Open()
wxLogNull nolog;
if ( CONST_CAST Open() ) if ( CONST_CAST Open() )
return KeyExists(m_hKey, szKey); return KeyExists(m_hKey, szKey);
else else