wxExecute may only be called from the main thread

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

diff --git a/src/msw/registry.cpp b/src/msw/registry.cpp
index ca0f62ace8f3530bf512b012e3ee5a83b07f31c3..4d3dc28b9b10f47c45c4031709ba32ede17dcfdb 100644 (file)
--- a/src/msw/registry.cpp
+++ b/src/msw/registry.cpp
@@ -299,11 +299,11 @@ bool wxRegKey::Exists() const
 // returns the full name of the key (prefix is abbreviated if bShortPrefix)
 wxString wxRegKey::GetName(bool bShortPrefix) const
 {
 // returns the full name of the key (prefix is abbreviated if bShortPrefix)
 wxString wxRegKey::GetName(bool bShortPrefix) const
 {

-  StdKey key = GetStdKeyFromHkey((StdKey) m_hRootKey);
+  StdKey key = GetStdKeyFromHkey((WXHKEY) m_hRootKey);

   wxString str = bShortPrefix ? aStdKeys[key].szShortName
                               : aStdKeys[key].szName;
   if ( !m_strKey.IsEmpty() )
   wxString str = bShortPrefix ? aStdKeys[key].szShortName
                               : aStdKeys[key].szName;
   if ( !m_strKey.IsEmpty() )

-    str << "\\" << m_strKey;
+    str << _T("\\") << m_strKey;

 
   return str;
 }
 
   return str;
 }