From c19a8a9a7187281b757808e651358198352b8f11 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 5 Dec 1998 23:10:04 +0000 Subject: [PATCH] 1. suppressed some messages from HasEntry()/HasKeys() 2. removed "wxWindows" from default wxRegConfig location git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1116 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/msw/regconf.cpp | 2 +- src/msw/registry.cpp | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/msw/regconf.cpp b/src/msw/regconf.cpp index c14d3e550c..5fec4bd4be 100644 --- a/src/msw/regconf.cpp +++ b/src/msw/regconf.cpp @@ -35,7 +35,7 @@ // ---------------------------------------------------------------------------- // we put our data in HKLM\SOFTWARE_KEY\appname -#define SOFTWARE_KEY wxString("Software\\wxWindows\\") +#define SOFTWARE_KEY wxString("Software\\") // ---------------------------------------------------------------------------- // global functions diff --git a/src/msw/registry.cpp b/src/msw/registry.cpp index f9431a9d1f..f4cdd7b3a5 100644 --- a/src/msw/registry.cpp +++ b/src/msw/registry.cpp @@ -522,6 +522,9 @@ bool wxRegKey::HasValue(const char *szValue) const // returns TRUE if this key has any subkeys bool wxRegKey::HasSubkeys() const { + // suppress possible messages from GetFirstKey() + wxLogNull nolog; + // just call GetFirstKey with dummy parameters wxString str; long l; @@ -531,6 +534,9 @@ bool wxRegKey::HasSubkeys() const // returns TRUE if given subkey exists bool wxRegKey::HasSubKey(const char *szKey) const { + // this function should be silent, so suppress possible messages from Open() + wxLogNull nolog; + if ( CONST_CAST Open() ) return KeyExists(m_hKey, szKey); else -- 2.45.2