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

diff --git a/src/msw/regconf.cpp b/src/msw/regconf.cpp
index c14d3e550ca94ca77934aa0a26408aaa350becdb..5fec4bd4be88cf5bf84f92639be046f798e25e7e 100644 (file)
--- 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 f9431a9d1f22f74a8d530b12c3f6f0080d3497ca..f4cdd7b3a5d48216eb32ee18d5910cadfe61776d 100644 (file)
--- 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