Changes to allow OLE to compile under mingw32/gcc-2.95

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

diff --git a/include/wx/msw/registry.h b/include/wx/msw/registry.h
index f4694aff5c11abdfc7a909ae1af81497baa477fc..958b78c878df9fd6e4040a734577c875b5b907f4 100644 (file)
--- a/include/wx/msw/registry.h
+++ b/include/wx/msw/registry.h
@@ -86,9 +86,9 @@ public:
     // number of standard keys
   static const size_t nStdKeys;
     // get the name of a standard key
     // 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
     // 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);
 
     // 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)
 
   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
   bool  GetKeyInfo(size_t *pnSubKeys,      // number of subkeys
                    size_t *pnMaxKeyLen,    // max len of subkey name
                    size_t *pnValues,       // number of values


@@ -154,27 +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
     // 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)
     // 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
 
   // access to values and subkeys
     // get value type

-  ValueType GetValueType(const char *szValue) const;
+  ValueType GetValueType(const wxChar *szValue) const;

     // returns TRUE if the value contains a number (else it's some string)
     // returns TRUE if the value contains a number (else it's some string)

-  bool IsNumericValue(const char *szValue) const
-  { 
-      ValueType type = GetValueType(szValue);
-      switch ( type ) {
-        case Type_Dword:
-        case Type_Dword_little_endian:
-        case Type_Dword_big_endian:
-            return TRUE;
-
-        default:
-            return FALSE;
-      }
-  }
+  bool IsNumericValue(const wxChar *szValue) const;

 
     // assignment operators set the default value of the key
   wxRegKey& operator=(const wxString& strValue)
 
     // assignment operators set the default value of the key
   wxRegKey& operator=(const wxString& strValue)


@@ -186,24 +174,28 @@ public:
   operator wxString() const;
 
     // set the string value
   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
     // 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
 
 #ifdef  __WIN32__
     // set the numeric value

-  bool  SetValue(const char *szValue, long lValue);
+  bool  SetValue(const wxChar *szValue, long lValue);

     // return the numeric value
     // 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
 #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
     // return true if given subkey exists

-  bool  HasSubKey(const char *szKey) const;
+  bool HasSubKey(const wxChar *szKey) const;

     // return true if any subkeys exist
     // 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);
 
   // enumerate values and subkeys
   bool  GetFirstValue(wxString& strValueName, long& lIndex);