Applied patch to avoid g_lib wanrings.

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

diff --git a/src/msw/registry.cpp b/src/msw/registry.cpp
index be83d9d14ef57fb38368d6b4cc20217513143d1d..175242651c9d6e5bb9a7bfebe971a48aedcd3a2f 100644 (file)
--- a/src/msw/registry.cpp
+++ b/src/msw/registry.cpp
@@ -608,7 +608,8 @@ bool wxRegKey::Copy(wxRegKey& keyDst)
         if ( ok )
             bCont = GetNextKey(strKey, lIndex);
        else
-           wxLogError(_("Failed to copy the registry subkey '%s' to '%s'."), GetFullName(&key), keyName.mb_str());
+           wxLogError(_("Failed to copy the registry subkey '%s' to '%s'."),
+                   GetFullName(&key), keyName.c_str());
            
     }
 
@@ -629,7 +630,8 @@ bool wxRegKey::Copy(wxRegKey& keyDst)
     }
 
     if ( !ok ) {
-        wxLogError(_("Failed to copy the contents of registry key '%s' to '%s'."), GetFullName(this), GetFullName(&keyDst));
+        wxLogError(_("Failed to copy the contents of registry key '%s' to '%s'."),
+                   GetFullName(this), GetFullName(&keyDst));
     }
 
     return ok;
@@ -654,7 +656,8 @@ bool wxRegKey::DeleteSelf()
   if ( m_strKey.IsEmpty() ||
        ((m_hRootKey != (WXHKEY) aStdKeys[HKCR].hkey) &&
         (m_strKey.Find(REG_SEPARATOR) == wxNOT_FOUND)) ) {
-      wxLogError(_("Registry key '%s' is needed for normal system operation,\ndeleting it will leave your system in unusable state:\noperation aborted."), GetFullName(this));
+      wxLogError(_("Registry key '%s' is needed for normal system operation,\ndeleting it will leave your system in unusable state:\noperation aborted."),
+                 GetFullName(this));
 
       return FALSE;
   }
@@ -937,6 +940,8 @@ bool wxRegKey::QueryValue(const wxChar *szValue,
                     wxLogLastError(_T("ExpandEnvironmentStrings"));
                 }
             }
+#else
+  wxUnusedVar(raw);
 #endif
             // __WXWINCE__
         }