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 b5e504f829c6c61b120a093e17fe9a356829bb75..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)
 // ----------------------------------------------------------------------------
-#if   USE_MUTABLE
+#if   wxUSE_MUTABLE
   #define MUTABLE mutable
 #else
   #define MUTABLE
@@ -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
   };
@@ -160,7 +160,9 @@ public:
 
   // 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)
@@ -203,40 +205,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