Added wxTreeCtrl::GetItemParent to deprecate GetParent.

[wxWidgets.git] / src / msw / registry.cpp

diff --git a/src/msw/registry.cpp b/src/msw/registry.cpp
index b0c061c1d0f5c53fbbe1940c8af69a6a6a43b775..75fb41f4aad3b25caac5745193f05b465fffabdd 100644 (file)
--- a/src/msw/registry.cpp
+++ b/src/msw/registry.cpp
@@ -303,7 +303,7 @@ wxString wxRegKey::GetName(bool bShortPrefix) const
   wxString str = bShortPrefix ? aStdKeys[key].szShortName
                               : aStdKeys[key].szName;
   if ( !m_strKey.IsEmpty() )
-    str << "\\" << m_strKey;
+    str << _T("\\") << m_strKey;
 
   return str;
 }
@@ -316,7 +316,7 @@ bool wxRegKey::GetKeyInfo(size_t *pnSubKeys,
 #if defined(__WIN32__) && !defined(__TWIN32__)
 
     // old gcc headers incorrectly prototype RegQueryInfoKey()
-#ifdef __GNUWIN32_OLD__
+#if defined(__GNUWIN32_OLD__) && !defined(__CYGWIN10__)
     #define REG_PARAM   (size_t *)
 #else
     #define REG_PARAM   (LPDWORD)
@@ -930,7 +930,7 @@ bool wxRegKey::SetValue(const wxChar *szValue, const wxString& strValue)
   return FALSE;
 }
 
-wxRegKey::operator wxString() const
+wxString wxRegKey::QueryDefaultValue() const
 {
   wxString str;
   QueryValue(NULL, str);