MinGW compilation fixes.

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

diff --git a/src/msw/registry.cpp b/src/msw/registry.cpp
index 9462ef29f0ed6452b45dd8ce2b467c5671d66009..26657e9c5d149d9c6f49f87ecf5ae072bc80b5d9 100644 (file)
--- a/src/msw/registry.cpp
+++ b/src/msw/registry.cpp
@@ -12,7 +12,7 @@
 //              - add high level functions (RegisterOleServer, ...)
 ///////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "registry.h"
 #endif
 
@@ -683,7 +683,9 @@ bool wxRegKey::DeleteSelf()
   Close();
 
   m_dwLastError = RegDeleteKey((HKEY) m_hRootKey, m_strKey);
-  if ( m_dwLastError != ERROR_SUCCESS ) {
+  // deleting a key which doesn't exist is not considered an error
+  if ( m_dwLastError != ERROR_SUCCESS &&
+          m_dwLastError != ERROR_FILE_NOT_FOUND ) {
     wxLogSysError(m_dwLastError, _("Can't delete key '%s'"),
                   GetName().c_str());
     return FALSE;
@@ -872,14 +874,12 @@ bool wxRegKey::QueryValue(const wxChar *szValue,
             strValue.Empty();
         }
         else {
-            RegString pBuf = (RegString)strValue.GetWriteBuf(dwSize);
             m_dwLastError = RegQueryValueEx((HKEY) m_hKey,
                                             WXSTRINGCAST szValue,
                                             RESERVED,
                                             &dwType,
-                                            pBuf,
+                                            (RegString)(wxChar*)wxStringBuffer(strValue, dwSize),
                                             &dwSize);
-            strValue.UngetWriteBuf();
 
             // expand the var expansions in the string unless disabled
 #ifndef __WXWINCE__
@@ -893,10 +893,9 @@ bool wxRegKey::QueryValue(const wxChar *szValue,
                     ok = ::ExpandEnvironmentStrings
                            (
                             strValue,
-                            strExpValue.GetWriteBuf(dwExpSize),
+                            wxStringBuffer(strExpValue, dwExpSize),
                             dwExpSize
                            ) != 0;
-                    strExpValue.UngetWriteBuf();
                     strValue = strExpValue;
                 }