fix wxBitmapComboBox Gtk-CRITICAL assertion `GTK_IS_ENTRY (entry)' failed

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

diff --git a/include/wx/msw/registry.h b/include/wx/msw/registry.h
index f5e4124b638bf72c521e7f25716b124af040814c..7969edba45314be9d65f74746752f224967966bc 100644 (file)
--- a/include/wx/msw/registry.h
+++ b/include/wx/msw/registry.h
@@ -12,7 +12,11 @@
 #ifndef _WX_MSW_REGISTRY_H_
 #define _WX_MSW_REGISTRY_H_
 
 #ifndef _WX_MSW_REGISTRY_H_
 #define _WX_MSW_REGISTRY_H_
 

-class WXDLLIMPEXP_BASE wxOutputStream;
+#include "wx/defs.h"
+
+#if wxUSE_REGKEY
+
+class WXDLLIMPEXP_FWD_BASE wxOutputStream;

 
 // ----------------------------------------------------------------------------
 // class wxRegKey encapsulates window HKEY handle
 
 // ----------------------------------------------------------------------------
 // class wxRegKey encapsulates window HKEY handle


@@ -62,6 +66,22 @@ public:
       Write     // read and write
   };
 
       Write     // read and write
   };
 

+  // Different registry views supported under WOW64.
+  enum WOW64ViewMode
+  {
+      // 32 bit registry for 32 bit applications, 64 bit registry
+      // for 64 bit ones.
+      WOW64ViewMode_Default,
+
+      // Can be used in 64 bit apps to access 32 bit registry,
+      // has no effect (i.e. treated as default) in 32 bit apps.
+      WOW64ViewMode_32,
+
+      // Can be used in 32 bit apps to access 64 bit registry,
+      // has no effect (i.e. treated as default) in 64 bit apps.
+      WOW64ViewMode_64
+  };
+

   // information about standard (predefined) registry keys
     // number of standard keys
   static const size_t nStdKeys;
   // information about standard (predefined) registry keys
     // number of standard keys
   static const size_t nStdKeys;


@@ -72,17 +92,23 @@ public:
     // get StdKey from root HKEY
   static StdKey GetStdKeyFromHkey(WXHKEY hkey);
 
     // get StdKey from root HKEY
   static StdKey GetStdKeyFromHkey(WXHKEY hkey);
 

-  // extacts the std key prefix from the string (return value) and
+  // extracts the std key prefix from the string (return value) and

   // leaves only the part after it (i.e. modifies the string passed!)
   static StdKey ExtractKeyName(wxString& str);
 
   // ctors
     // root key is set to HKCR (the only root key under Win16)
   // leaves only the part after it (i.e. modifies the string passed!)
   static StdKey ExtractKeyName(wxString& str);
 
   // ctors
     // root key is set to HKCR (the only root key under Win16)

-  wxRegKey();
+    wxRegKey(WOW64ViewMode viewMode = WOW64ViewMode_Default);
+

     // strKey is the full name of the key (i.e. starting with HKEY_xxx...)
     // strKey is the full name of the key (i.e. starting with HKEY_xxx...)

-  wxRegKey(const wxString& strKey);
+    wxRegKey(const wxString& strKey,
+        WOW64ViewMode viewMode = WOW64ViewMode_Default);
+

     // strKey is the name of key under (standard key) keyParent
     // strKey is the name of key under (standard key) keyParent

-  wxRegKey(StdKey keyParent, const wxString& strKey);
+    wxRegKey(StdKey keyParent,
+        const wxString& strKey,
+        WOW64ViewMode viewMode = WOW64ViewMode_Default);
+

     // strKey is the name of key under (previously created) keyParent
   wxRegKey(const wxRegKey& keyParent, const wxString& strKey);
     // dtor closes the key
     // strKey is the name of key under (previously created) keyParent
   wxRegKey(const wxRegKey& keyParent, const wxString& strKey);
     // dtor closes the key


@@ -101,6 +127,8 @@ public:
   // get infomation about the key
     // get the (full) key name. Abbreviate std root keys if bShortPrefix.
   wxString GetName(bool bShortPrefix = true) const;
   // get infomation about the key
     // get the (full) key name. Abbreviate std root keys if bShortPrefix.
   wxString GetName(bool bShortPrefix = true) const;

+    // Retrieves the registry view used by this key.
+    WOW64ViewMode GetView() const { return m_viewMode; }

     // return true if the key exists
   bool  Exists() const;
     // get the info about key (any number of these pointers may be NULL)
     // return true if the key exists
   bool  Exists() const;
     // get the info about key (any number of these pointers may be NULL)


@@ -231,16 +259,18 @@ private:
   wxString FormatValue(const wxString& name) const;
 
 
   wxString FormatValue(const wxString& name) const;
 
 

-  WXHKEY      m_hKey,           // our handle
-              m_hRootKey;       // handle of the top key (i.e. StdKey)
-  wxString    m_strKey;         // key name (relative to m_hRootKey)
-
-  AccessMode  m_mode;           // valid only if key is opened
-  long        m_dwLastError;    // last error (0 if none)
+  WXHKEY        m_hKey,          // our handle
+                m_hRootKey;      // handle of the top key (i.e. StdKey)
+  wxString      m_strKey;        // key name (relative to m_hRootKey)
+  WOW64ViewMode m_viewMode;      // which view to select under WOW64
+  AccessMode    m_mode;          // valid only if key is opened
+  long          m_dwLastError;   // last error (0 if none)

 
 
 
 

-  DECLARE_NO_COPY_CLASS(wxRegKey)
+  wxDECLARE_NO_COPY_CLASS(wxRegKey);

 };
 
 };
 

+#endif // wxUSE_REGKEY
+

 #endif // _WX_MSW_REGISTRY_H_
 
 #endif // _WX_MSW_REGISTRY_H_