Added files for wxNotebook and wxCocoaNSTabView

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

diff --git a/src/msw/registry.cpp b/src/msw/registry.cpp
index 188b50632bd0137932190eb3dcbd4ee492fa6f11..b2a25f43918594b2c1e749af7a23f0a6c7cf0827 100644 (file)
--- a/src/msw/registry.cpp
+++ b/src/msw/registry.cpp
@@ -12,7 +12,7 @@
 //              - add high level functions (RegisterOleServer, ...)
 ///////////////////////////////////////////////////////////////////////////////
 
 //              - add high level functions (RegisterOleServer, ...)
 ///////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "registry.h"
 #endif
 
 #pragma implementation "registry.h"
 #endif
 


@@ -28,15 +28,13 @@
 #include  "wx/intl.h"
 #include  "wx/log.h"
 
 #include  "wx/intl.h"
 #include  "wx/log.h"
 

-#ifndef __WIN16__
-

 // Windows headers
 /*
 #define   STRICT
 #define   WIN32_LEAN_AND_MEAN
 */
 
 // Windows headers
 /*
 #define   STRICT
 #define   WIN32_LEAN_AND_MEAN
 */
 

-#include  <windows.h>
+#include  "wx/msw/wrapwin.h"

 
 #ifdef __WXWINCE__
 #include "wx/msw/private.h"
 
 #ifdef __WXWINCE__
 #include "wx/msw/private.h"


@@ -321,8 +319,6 @@ bool wxRegKey::GetKeyInfo(size_t *pnSubKeys,
                           size_t *pnValues,
                           size_t *pnMaxValueLen) const
 {
                           size_t *pnValues,
                           size_t *pnMaxValueLen) const
 {

-#if defined(__WIN32__)
-

     // old gcc headers incorrectly prototype RegQueryInfoKey()
 #if defined(__GNUWIN32_OLD__) && !defined(__CYGWIN10__)
     #define REG_PARAM   (size_t *)
     // old gcc headers incorrectly prototype RegQueryInfoKey()
 #if defined(__GNUWIN32_OLD__) && !defined(__CYGWIN10__)
     #define REG_PARAM   (size_t *)


@@ -362,11 +358,6 @@ bool wxRegKey::GetKeyInfo(size_t *pnSubKeys,
   }
 
   return TRUE;
   }
 
   return TRUE;

-#else // Win16
-  wxFAIL_MSG("GetKeyInfo() not implemented");
-
-  return FALSE;
-#endif

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -374,7 +365,7 @@ bool wxRegKey::GetKeyInfo(size_t *pnSubKeys,
 // ----------------------------------------------------------------------------
 
 // opens key (it's not an error to call Open() on an already opened key)
 // ----------------------------------------------------------------------------
 
 // opens key (it's not an error to call Open() on an already opened key)

-bool wxRegKey::Open()
+bool wxRegKey::Open(AccessMode mode)

 {
     if ( IsOpened() )
         return TRUE;
 {
     if ( IsOpened() )
         return TRUE;


@@ -385,7 +376,7 @@ bool wxRegKey::Open()
                         (HKEY) m_hRootKey,
                         m_strKey,
                         RESERVED,
                         (HKEY) m_hRootKey,
                         m_strKey,
                         RESERVED,

-                        KEY_ALL_ACCESS,
+                        mode == Read ? KEY_READ : KEY_ALL_ACCESS,

                         &tmpKey
                     );
 
                         &tmpKey
                     );
 


@@ -683,7 +674,9 @@ bool wxRegKey::DeleteSelf()
   Close();
 
   m_dwLastError = RegDeleteKey((HKEY) m_hRootKey, m_strKey);
   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;
     wxLogSysError(m_dwLastError, _("Can't delete key '%s'"),
                   GetName().c_str());
     return FALSE;


@@ -706,7 +699,6 @@ bool wxRegKey::DeleteValue(const wxChar *szValue)
   if ( !Open() )
     return FALSE;
 
   if ( !Open() )
     return FALSE;
 

-#if defined(__WIN32__)

     m_dwLastError = RegDeleteValue((HKEY) m_hKey, WXSTRINGCAST szValue);
 
     // deleting a value which doesn't exist is not considered an error
     m_dwLastError = RegDeleteValue((HKEY) m_hKey, WXSTRINGCAST szValue);
 
     // deleting a value which doesn't exist is not considered an error


@@ -716,18 +708,6 @@ bool wxRegKey::DeleteValue(const wxChar *szValue)
                     szValue, GetName().c_str());
       return FALSE;
     }
                     szValue, GetName().c_str());
       return FALSE;
     }

-#else   //WIN16
-    // named registry values don't exist in Win16 world
-    wxASSERT( IsEmpty(szValue) );
-
-    // just set the (default and unique) value of the key to ""
-    m_dwLastError = RegSetValue((HKEY) m_hKey, NULL, REG_SZ, "", RESERVED);
-    if ( m_dwLastError != ERROR_SUCCESS ) {
-      wxLogSysError(m_dwLastError, _("Can't delete value of key '%s'"),
-                    GetName().c_str());
-      return FALSE;
-    }
-#endif  //WIN16/32

 
   return TRUE;
 }
 
   return TRUE;
 }


@@ -742,7 +722,6 @@ bool wxRegKey::HasValue(const wxChar *szValue) const
   // this function should be silent, so suppress possible messages from Open()
   wxLogNull nolog;
 
   // this function should be silent, so suppress possible messages from Open()
   wxLogNull nolog;
 

-  #ifdef  __WIN32__

     if ( !CONST_CAST Open() )
         return FALSE;
 
     if ( !CONST_CAST Open() )
         return FALSE;
 


@@ -751,10 +730,6 @@ bool wxRegKey::HasValue(const wxChar *szValue) const
                                    RESERVED,
                                    NULL, NULL, NULL);
     return dwRet == ERROR_SUCCESS;
                                    RESERVED,
                                    NULL, NULL, NULL);
     return dwRet == ERROR_SUCCESS;

-  #else   // WIN16
-    // only unnamed value exists
-    return IsEmpty(szValue);
-  #endif  // WIN16/32

 }
 
 // returns TRUE if this key has any values
 }
 
 // returns TRUE if this key has any values


@@ -795,7 +770,6 @@ bool wxRegKey::HasSubKey(const wxChar *szKey) const
 
 wxRegKey::ValueType wxRegKey::GetValueType(const wxChar *szValue) const
 {
 
 wxRegKey::ValueType wxRegKey::GetValueType(const wxChar *szValue) const
 {

-  #ifdef  __WIN32__

     if ( ! CONST_CAST Open() )
       return Type_None;
 
     if ( ! CONST_CAST Open() )
       return Type_None;
 


@@ -809,9 +783,6 @@ wxRegKey::ValueType wxRegKey::GetValueType(const wxChar *szValue) const
     }
 
     return (ValueType)dwType;
     }
 
     return (ValueType)dwType;

-  #else   //WIN16
-    return IsEmpty(szValue) ? Type_String : Type_None;
-  #endif  //WIN16/32

 }
 
 #ifdef  __WIN32__
 }
 
 #ifdef  __WIN32__


@@ -860,7 +831,7 @@ bool wxRegKey::QueryValue(const wxChar *szValue,
                           bool raw) const
 {
   if ( CONST_CAST Open() ) {
                           bool raw) const
 {
   if ( CONST_CAST Open() ) {

-    #ifdef  __WIN32__
+

       // first get the type and size of the data
       DWORD dwType, dwSize;
       m_dwLastError = RegQueryValueEx((HKEY) m_hKey, WXSTRINGCAST szValue, RESERVED,
       // first get the type and size of the data
       DWORD dwType, dwSize;
       m_dwLastError = RegQueryValueEx((HKEY) m_hKey, WXSTRINGCAST szValue, RESERVED,


@@ -872,14 +843,12 @@ bool wxRegKey::QueryValue(const wxChar *szValue,
             strValue.Empty();
         }
         else {
             strValue.Empty();
         }
         else {

-            RegString pBuf = (RegString)strValue.GetWriteBuf(dwSize);

             m_dwLastError = RegQueryValueEx((HKEY) m_hKey,
                                             WXSTRINGCAST szValue,
                                             RESERVED,
                                             &dwType,
             m_dwLastError = RegQueryValueEx((HKEY) m_hKey,
                                             WXSTRINGCAST szValue,
                                             RESERVED,
                                             &dwType,

-                                            pBuf,
+                                            (RegString)(wxChar*)wxStringBuffer(strValue, dwSize),

                                             &dwSize);
                                             &dwSize);

-            strValue.UngetWriteBuf();

 
             // expand the var expansions in the string unless disabled
 #ifndef __WXWINCE__
 
             // expand the var expansions in the string unless disabled
 #ifndef __WXWINCE__


@@ -893,10 +862,9 @@ bool wxRegKey::QueryValue(const wxChar *szValue,
                     ok = ::ExpandEnvironmentStrings
                            (
                             strValue,
                     ok = ::ExpandEnvironmentStrings
                            (
                             strValue,

-                            strExpValue.GetWriteBuf(dwExpSize),
+                            wxStringBuffer(strExpValue, dwExpSize),

                             dwExpSize
                            ) != 0;
                             dwExpSize
                            ) != 0;

-                    strExpValue.UngetWriteBuf();

                     strValue = strExpValue;
                 }
 
                     strValue = strExpValue;
                 }
 


@@ -917,15 +885,6 @@ bool wxRegKey::QueryValue(const wxChar *szValue,
           return TRUE;
         }
       }
           return TRUE;
         }
       }

-    #else   //WIN16
-      // named registry values don't exist in Win16
-      wxASSERT( IsEmpty(szValue) );
-
-      m_dwLastError = RegQueryValue((HKEY) m_hKey, 0, strValue.GetWriteBuf(256), &l);
-      strValue.UngetWriteBuf();
-      if ( m_dwLastError == ERROR_SUCCESS )
-        return TRUE;
-    #endif  //WIN16/32

   }
 
   wxLogSysError(m_dwLastError, _("Can't read value of '%s'"),
   }
 
   wxLogSysError(m_dwLastError, _("Can't read value of '%s'"),


@@ -936,20 +895,11 @@ bool wxRegKey::QueryValue(const wxChar *szValue,
 bool wxRegKey::SetValue(const wxChar *szValue, const wxString& strValue)
 {
   if ( CONST_CAST Open() ) {
 bool wxRegKey::SetValue(const wxChar *szValue, const wxString& strValue)
 {
   if ( CONST_CAST Open() ) {

-#if defined( __WIN32__)

       m_dwLastError = RegSetValueEx((HKEY) m_hKey, szValue, (DWORD) RESERVED, REG_SZ,
                                     (RegString)strValue.c_str(),
                                     (strValue.Len() + 1)*sizeof(wxChar));
       if ( m_dwLastError == ERROR_SUCCESS )
         return TRUE;
       m_dwLastError = RegSetValueEx((HKEY) m_hKey, szValue, (DWORD) RESERVED, REG_SZ,
                                     (RegString)strValue.c_str(),
                                     (strValue.Len() + 1)*sizeof(wxChar));
       if ( m_dwLastError == ERROR_SUCCESS )
         return TRUE;

-#else   //WIN16
-      // named registry values don't exist in Win16
-      wxASSERT( IsEmpty(szValue) );
-
-      m_dwLastError = RegSetValue((HKEY) m_hKey, NULL, REG_SZ, strValue, NULL);
-      if ( m_dwLastError == ERROR_SUCCESS )
-        return TRUE;
-#endif  //WIN16/32

   }
 
   wxLogSysError(m_dwLastError, _("Can't set value of '%s'"),
   }
 
   wxLogSysError(m_dwLastError, _("Can't set value of '%s'"),


@@ -987,7 +937,6 @@ bool wxRegKey::GetNextValue(wxString& strValueName, long& lIndex) const
   if ( lIndex == -1 )
     return FALSE;
 
   if ( lIndex == -1 )
     return FALSE;
 

-#if defined( __WIN32__)

     wxChar  szValueName[1024];                  // @@ use RegQueryInfoKey...
     DWORD dwValueLen = WXSIZEOF(szValueName);
 
     wxChar  szValueName[1024];                  // @@ use RegQueryInfoKey...
     DWORD dwValueLen = WXSIZEOF(szValueName);
 


@@ -1012,13 +961,6 @@ bool wxRegKey::GetNextValue(wxString& strValueName, long& lIndex) const
     }
 
     strValueName = szValueName;
     }
 
     strValueName = szValueName;

-#else   //WIN16
-    // only one unnamed value
-    wxASSERT( lIndex == 0 );
-
-    lIndex = -1;
-    strValueName.Empty();
-#endif

 
   return TRUE;
 }
 
   return TRUE;
 }


@@ -1098,7 +1040,7 @@ bool KeyExists(WXHKEY hRootKey, const wxChar *szKey)
             (HKEY)hRootKey,
             szKey,
             RESERVED,
             (HKEY)hRootKey,
             szKey,
             RESERVED,

-            KEY_ALL_ACCESS,
+            KEY_READ,        // we might not have enough rights for rw access

             &hkeyDummy
          ) == ERROR_SUCCESS )
     {
             &hkeyDummy
          ) == ERROR_SUCCESS )
     {


@@ -1126,6 +1068,3 @@ void RemoveTrailingSeparator(wxString& str)
     str.Truncate(str.Len() - 1);
 }
 
     str.Truncate(str.Len() - 1);
 }
 

-#endif
-  // __WIN16__
-