spurious error messages from wxRegKey::HasValue() suppressed

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@615 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/msw/registry.cpp b/src/msw/registry.cpp
index c4b547d93f822a2b9569e0dbb74de46e02e9efb4..f6b5ea6cb9666459b97e0a663493ce50e7a6bb23 100644 (file)
--- a/src/msw/registry.cpp
+++ b/src/msw/registry.cpp
@@ -214,8 +214,10 @@ wxRegKey::wxRegKey(const wxRegKey& keyParent, const wxString& strKey)
         : m_strKey(keyParent.m_strKey)
 {
   // combine our name with parent's to get the full name
         : m_strKey(keyParent.m_strKey)
 {
   // combine our name with parent's to get the full name

-  if ( !m_strKey.IsEmpty() && strKey[0] != REG_SEPARATOR )
-      m_strKey  += REG_SEPARATOR;
+  if ( !m_strKey.IsEmpty() && 
+       (strKey.IsEmpty() || strKey[0] != REG_SEPARATOR) ) {
+      m_strKey += REG_SEPARATOR;
+  }

 
   m_strKey += strKey;
   RemoveTrailingSeparator(m_strKey);
 
   m_strKey += strKey;
   RemoveTrailingSeparator(m_strKey);


@@ -495,6 +497,9 @@ bool wxRegKey::DeleteValue(const char *szValue)
 // return TRUE if value exists
 bool wxRegKey::HasValue(const char *szValue) const
 {
 // return TRUE if value exists
 bool wxRegKey::HasValue(const char *szValue) const
 {

+  // this function should be silent, so suppress possible messages from Open()
+  wxLogNull nolog;
+  

   #ifdef  __WIN32__
     if ( CONST_CAST Open() ) {
       return RegQueryValueEx(m_hKey, szValue, RESERVED, 
   #ifdef  __WIN32__
     if ( CONST_CAST Open() ) {
       return RegQueryValueEx(m_hKey, szValue, RESERVED,