wxRegConfig now works correctly again

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@692 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/msw/regconf.h b/include/wx/msw/regconf.h
index 3c33e2731acd1423dd0a5e50001867a7cfc1d2f6..d8274e321e04fe49026a9264859890cdc3e69714 100644 (file)
--- a/include/wx/msw/regconf.h
+++ b/include/wx/msw/regconf.h
@@ -29,9 +29,9 @@ class wxRegConfig : public wxConfigBase
 public:
   // ctor & dtor
     // will store data in HKLM\appName and HKCU\appName
-  wxRegConfig(const wxString& appName = wxEmptyString, const wxString& vendorName = wxEmptyString,
-    const wxString& localFilename = wxEmptyString, const wxString& globalFilename = wxEmptyString,
-    long style = 0);
+  wxRegConfig(const wxString& appName = "", const wxString& vendorName = "",
+              const wxString& localFilename = "", const wxString& globalFilename = "",
+              long style = 0);
 
     // dtor will save unsaved data
   virtual ~wxRegConfig();
@@ -66,15 +66,15 @@ public:
 
   // The following are necessary to satisfy the compiler
   wxString Read(const wxString& key, const wxString& defVal) const
-  { return wxConfigBase::Read(key, defVal); }
+    { return wxConfigBase::Read(key, defVal); }
   bool Read(const wxString& key, long *pl, long defVal) const
-  { return wxConfigBase::Read(key, pl, defVal); }
+    { return wxConfigBase::Read(key, pl, defVal); }
   long Read(const wxString& key, long defVal) const
-  { return wxConfigBase::Read(key, defVal); }
+    { return wxConfigBase::Read(key, defVal); }
   bool Read(const wxString& key, double* val) const
-  { return wxConfigBase::Read(key, val); }
+    { return wxConfigBase::Read(key, val); }
   bool Read(const wxString& key, double* val, double defVal) const
-  { return wxConfigBase::Read(key, val, defVal); }
+    { return wxConfigBase::Read(key, val, defVal); }
 
   bool Write(const wxString& key, const wxString& szValue);
   bool Write(const wxString& key, long lValue);

diff --git a/include/wx/msw/registry.h b/include/wx/msw/registry.h
index c330e7dbf0ca4109923d05b9c3831b8be31135f4..b5e504f829c6c61b120a093e17fe9a356829bb75 100644 (file)
--- a/include/wx/msw/registry.h
+++ b/include/wx/msw/registry.h
@@ -210,5 +210,33 @@ private:
   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