1. wxBitmap copy ctor and operator=() taking wxIcon added

[wxWidgets.git] / include / wx / msw / registry.h

diff --git a/include/wx/msw/registry.h b/include/wx/msw/registry.h
index 62d2f9a3ca10cf9149cf51d88724caa2e41841f6..958b78c878df9fd6e4040a734577c875b5b907f4 100644 (file)
--- a/include/wx/msw/registry.h
+++ b/include/wx/msw/registry.h
@@ -62,22 +62,22 @@ public:
     Type_Multi_String,               // Multiple Unicode strings
     Type_Resource_list,              // Resource list in the resource map
     Type_Full_resource_descriptor,   // Resource list in the hardware description
-    Type_Resource_requirements_list, // ???
+    Type_Resource_requirements_list  // ???
 #endif  //WIN32
   };
 
   // predefined registry keys
   enum StdKey
   {
-    HKCR,     // classes root
+    HKCR     // classes root
 #ifdef  __WIN32__
-    HKCU,     // current user
+    , HKCU,     // current user
     HKLM,     // local machine
     HKUSR,    // users
-    HKPD,     // performance data (@@ NT only?)
+    HKPD     // performance data (@@ NT only?)
 #if    WINVER >= 0x0400
-    HKCC,     // current config
-    HKDD,     // dynamic data
+    , HKCC,     // current config
+    HKDD     // dynamic data
 #endif  // Winver
 #endif  // Win32/16
   };
@@ -86,9 +86,9 @@ public:
     // number of standard keys
   static const size_t nStdKeys;
     // get the name of a standard key
-  static const char *GetStdKeyName(size_t key);
+  static const wxChar *GetStdKeyName(size_t key);
     // get the short name of a standard key
-  static const char *GetStdKeyShortName(size_t key);
+  static const wxChar *GetStdKeyShortName(size_t key);
     // get StdKey from root HKEY
   static StdKey GetStdKeyFromHkey(WXHKEY hkey);
 
@@ -125,7 +125,7 @@ public:
   bool  Exists() const;
     // get the info about key (any number of these pointers may be NULL)
 
-#ifdef __GNUWIN32__
+#if defined( __GNUWIN32__) && !defined(wxUSE_NORLANDER_HEADERS)
   bool  GetKeyInfo(size_t *pnSubKeys,      // number of subkeys
                    size_t *pnMaxKeyLen,    // max len of subkey name
                    size_t *pnValues,       // number of values
@@ -154,13 +154,15 @@ public:
     // deletes this key and all of it's subkeys/values
   bool  DeleteSelf();
     // deletes the subkey with all of it's subkeys/values recursively
-  bool  DeleteKey(const char *szKey);
+  bool  DeleteKey(const wxChar *szKey);
     // deletes the named value (may be NULL to remove the default value)
-  bool  DeleteValue(const char *szValue);
+  bool  DeleteValue(const wxChar *szValue);
 
   // access to values and subkeys
     // get value type
-  ValueType GetValueType(const char *szValue);
+  ValueType GetValueType(const wxChar *szValue) const;
+    // returns TRUE if the value contains a number (else it's some string)
+  bool IsNumericValue(const wxChar *szValue) const;
 
     // assignment operators set the default value of the key
   wxRegKey& operator=(const wxString& strValue)
@@ -172,24 +174,28 @@ public:
   operator wxString() const;
 
     // set the string value
-  bool  SetValue(const char *szValue, const wxString& strValue);
+  bool  SetValue(const wxChar *szValue, const wxString& strValue);
     // return the string value
-  bool  QueryValue(const char *szValue, wxString& strValue) const;
+  bool  QueryValue(const wxChar *szValue, wxString& strValue) const;
 
 #ifdef  __WIN32__
     // set the numeric value
-  bool  SetValue(const char *szValue, long lValue);
+  bool  SetValue(const wxChar *szValue, long lValue);
     // return the numeric value
-  bool  QueryValue(const char *szValue, long *plValue) const;
+  bool  QueryValue(const wxChar *szValue, long *plValue) const;
 #endif  //Win32
 
   // query existence of a key/value
     // return true if value exists
-  bool  HasValue(const char *szKey) const;
+  bool HasValue(const wxChar *szKey) const;
     // return true if given subkey exists
-  bool  HasSubKey(const char *szKey) const;
+  bool HasSubKey(const wxChar *szKey) const;
     // return true if any subkeys exist
-  bool  HasSubkeys() const;
+  bool HasSubkeys() const;
+    // return true if any values exist
+  bool HasValues() const;
+    // return true if the key is empty (nothing under this key)
+  bool IsEmpty() const { return !HasSubkeys() && !HasValues(); }
 
   // enumerate values and subkeys
   bool  GetFirstValue(wxString& strValueName, long& lIndex);
@@ -203,40 +209,12 @@ private:
   wxRegKey(const wxRegKey& key);            // not implemented
   wxRegKey& operator=(const wxRegKey& key); // not implemented
 
-  WXHKEY        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)
 
   MUTABLE long m_dwLastError;   // last error (0 if none)
 };
 
-// ----------------------------------------------------------------------------
-// high level functions working with the registry
-// ----------------------------------------------------------------------------
-
-// file extensions and MIME types
-// ------------------------------
-
-// Look for and return the extension (with leading '.') which corresponds to
-// MIME type strMimeType in pExt.
-//
-// Return value: true if MIME type was found, false otherwise
-bool GetExtensionFromMimeType(wxString *pExt, const wxString& strMimeType);
-
-// Look for MIME type of the given extension, return TRUE if found.
-bool GetMimeTypeFromExtension(wxString *pMimeType, const wxString& strExt);
-
-// Get file type from extension (it's not the same thing: for example, for
-// the extension .txt the default file type is txtfile), return FALSE if not
-// found.
-bool GetFileTypeFromExtension(wxString *pFileType, const wxString& strExt);
-
-// Get the default icon from file type
-class wxIcon;
-bool GetFileTypeIcon(wxIcon *pIcon, const wxString& strFileType);
-
-// Get the description of files of this type
-bool GetFileTypeDescription(wxString *pDesc, const wxString& strFileType);
-
 #endif  //_REGISTRY_H