X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2bda0e173844e8e0f8acf4e8ad8b5c26e5c6fe5d..9a29912f608e082001ee53b9873323c4bcd71f21:/include/wx/msw/registry.h

diff --git a/include/wx/msw/registry.h b/include/wx/msw/registry.h
index adacf76944..944bb8e53e 100644
--- a/include/wx/msw/registry.h
+++ b/include/wx/msw/registry.h
@@ -6,28 +6,37 @@
 // Created:     03.04.198
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef   _REGISTRY_H
 #define   _REGISTRY_H
 
+#ifdef __GNUG__
+#pragma interface "registry.h"
+#endif
+
 // ----------------------------------------------------------------------------
 // mutable hack (see also registry.cpp)
 // ----------------------------------------------------------------------------
-#if   USE_MUTABLE
+#if   wxUSE_MUTABLE
   #define MUTABLE mutable
 #else
   #define MUTABLE
 #endif
 
 // ----------------------------------------------------------------------------
-// forward decl for handle type
+// types used in this module
 // ----------------------------------------------------------------------------
+
+/*
 #ifndef   HKEY_DEFINED
   #define HKEY_DEFINED
   #define HKEY unsigned long
 #endif
+*/
+
+typedef unsigned long ulong;
 
 // ----------------------------------------------------------------------------
 // class wxRegKey encapsulates window HKEY handle
@@ -77,11 +86,11 @@ public:
     // number of standard keys
   static const size_t nStdKeys;
     // get the name of a standard key
-  static const char *GetStdKeyName(uint key);
+  static const char *GetStdKeyName(size_t key);
     // get the short name of a standard key
-  static const char *GetStdKeyShortName(uint key);
+  static const char *GetStdKeyShortName(size_t key);
     // get StdKey from root HKEY
-  static StdKey GetStdKeyFromHkey(HKEY hkey);
+  static StdKey GetStdKeyFromHkey(WXHKEY hkey);
 
   // extacts the std key prefix from the string (return value) and
   // leaves only the part after it (i.e. modifies the string passed!)
@@ -93,23 +102,42 @@ public:
     // strKey is the full name of the key (i.e. starting with HKEY_xxx...)
   wxRegKey(const wxString& strKey);
     // strKey is the name of key under (standard key) keyParent
-  wxRegKey(StdKey          keyParent, const wxString& strKey);
+  wxRegKey(StdKey keyParent, const wxString& strKey);
     // strKey is the name of key under (previously created) keyParent
   wxRegKey(const wxRegKey& keyParent, const wxString& strKey);
     //
  ~wxRegKey();
 
   // change key (closes the previously opened key if any)
+    // the name is absolute, i.e. should start with HKEY_xxx
   void  SetName(const wxString& strKey);
-  void  SetHkey(HKEY  hKey);
+    // the name is relative to the parent key
+  void  SetName(StdKey keyParent, const wxString& strKey);
+    // the name is relative to the parent key
+  void  SetName(const wxRegKey& keyParent, const wxString& strKey);
+    // hKey should be opened and will be closed in wxRegKey dtor
+  void  SetHkey(WXHKEY hKey);
 
   // get infomation about the key
     // get the (full) key name. Abbreviate std root keys if bShortPrefix.
   wxString GetName(bool bShortPrefix = TRUE) const;
-    // return TRUE if the key exists
-  bool  Exists()   const;
-    // return TRUE if the key is opened
-  bool  IsOpened() const { return m_hKey != 0;        }
+    // return true if the key exists
+  bool  Exists() const;
+    // get the info about key (any number of these pointers may be NULL)
+
+#ifdef __GNUWIN32__
+  bool  GetKeyInfo(size_t *pnSubKeys,      // number of subkeys
+                   size_t *pnMaxKeyLen,    // max len of subkey name
+                   size_t *pnValues,       // number of values
+                   size_t *pnMaxValueLen) const;
+#else
+  bool  GetKeyInfo(ulong *pnSubKeys,      // number of subkeys
+                   ulong *pnMaxKeyLen,    // max len of subkey name
+                   ulong *pnValues,       // number of values
+                   ulong *pnMaxValueLen) const;
+#endif
+    // return true if the key is opened
+  bool  IsOpened() const { return m_hKey != 0; }
     // for "if ( !key ) wxLogError(...)" kind of expressions
   operator bool()  const { return m_dwLastError == 0; }
 
@@ -155,16 +183,17 @@ public:
   bool  QueryValue(const char *szValue, long *plValue) const;
 #endif  //Win32
 
-    // return TRUE if given subkey exists
+  // query existence of a key/value
+    // return true if value exists
+  bool  HasValue(const char *szKey) const;
+    // return true if given subkey exists
   bool  HasSubKey(const char *szKey) const;
-    // return TRUE if any subkeys exist
+    // return true if any subkeys exist
   bool  HasSubkeys() const;
 
   // enumerate values and subkeys
-#ifdef  __WIN32__
   bool  GetFirstValue(wxString& strValueName, long& lIndex);
   bool  GetNextValue (wxString& strValueName, long& lIndex) const;
-#endif  //Win32
 
   bool  GetFirstKey  (wxString& strKeyName  , long& lIndex);
   bool  GetNextKey   (wxString& strKeyName  , long& lIndex) const;
@@ -174,7 +203,7 @@ private:
   wxRegKey(const wxRegKey& key);            // not implemented
   wxRegKey& operator=(const wxRegKey& key); // not implemented
 
-  HKEY        m_hKey,           // our handle
+  WXHKEY      m_hKey,           // our handle
               m_hRootKey;       // handle of the top key (i.e. StdKey)
   wxString    m_strKey;         // key name (relative to m_hRootKey)
 
@@ -182,3 +211,4 @@ private:
 };
 
 #endif  //_REGISTRY_H
+