changed removed wxToUpper to standard toupper

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

diff --git a/include/wx/msw/registry.h b/include/wx/msw/registry.h
index 4452ba9d944f7767facf5a6d00e54bf13565a23a..8f43954176a372e7f9a5d3e821aaadb5a29090c5 100644 (file)
--- a/include/wx/msw/registry.h
+++ b/include/wx/msw/registry.h
@@ -19,7 +19,7 @@
 // ----------------------------------------------------------------------------
 // mutable hack (see also registry.cpp)
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // mutable hack (see also registry.cpp)
 // ----------------------------------------------------------------------------

-#if   USE_MUTABLE
+#if   wxUSE_MUTABLE

   #define MUTABLE mutable
 #else
   #define MUTABLE
   #define MUTABLE mutable
 #else
   #define MUTABLE


@@ -28,10 +28,13 @@
 // ----------------------------------------------------------------------------
 // types used in this module
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // types used in this module
 // ----------------------------------------------------------------------------

+
+/*

 #ifndef   HKEY_DEFINED
   #define HKEY_DEFINED
   #define HKEY unsigned long
 #endif
 #ifndef   HKEY_DEFINED
   #define HKEY_DEFINED
   #define HKEY unsigned long
 #endif

+*/

 
 typedef unsigned long ulong;
 
 
 typedef unsigned long ulong;
 


@@ -59,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_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
   {
 #endif  //WIN32
   };
 
   // predefined registry keys
   enum StdKey
   {

-    HKCR,     // classes root
+    HKCR     // classes root

 #ifdef  __WIN32__
 #ifdef  __WIN32__

-    HKCU,     // current user
+    , HKCU,     // current user

     HKLM,     // local machine
     HKUSR,    // users
     HKLM,     // local machine
     HKUSR,    // users

-    HKPD,     // performance data (@@ NT only?)
+    HKPD     // performance data (@@ NT only?)

 #if    WINVER >= 0x0400
 #if    WINVER >= 0x0400

-    HKCC,     // current config
-    HKDD,     // dynamic data
+    , HKCC,     // current config
+    HKDD     // dynamic data

 #endif  // Winver
 #endif  // Win32/16
   };
 #endif  // Winver
 #endif  // Win32/16
   };


@@ -87,7 +90,7 @@ public:
     // get the short name of a standard key
   static const char *GetStdKeyShortName(size_t key);
     // get StdKey from root HKEY
     // get the short name of a standard 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!)
 
   // extacts the std key prefix from the string (return value) and
   // leaves only the part after it (i.e. modifies the string passed!)


@@ -113,7 +116,7 @@ public:
     // 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
     // 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(HKEY hKey);
+  void  SetHkey(WXHKEY hKey);

 
   // get infomation about the key
     // get the (full) key name. Abbreviate std root keys if bShortPrefix.
 
   // get infomation about the key
     // get the (full) key name. Abbreviate std root keys if bShortPrefix.


@@ -157,7 +160,9 @@ public:
 
   // access to values and subkeys
     // get value type
 
   // access to values and subkeys
     // get value type

-  ValueType GetValueType(const char *szValue);
+  ValueType GetValueType(const char *szValue) const;
+    // returns TRUE if the value contains a number (else it's some string)
+  bool IsNumericValue(const char *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)


@@ -200,7 +205,7 @@ private:
   wxRegKey(const wxRegKey& key);            // not implemented
   wxRegKey& operator=(const wxRegKey& key); // not implemented
 
   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)
 
               m_hRootKey;       // handle of the top key (i.e. StdKey)
   wxString    m_strKey;         // key name (relative to m_hRootKey)