removed WXWIN_COMPATIBILITY_2_4 in non-MSW code

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

diff --git a/include/wx/msw/registry.h b/include/wx/msw/registry.h
index ec2fe0a8426e0ef0c624ae31510d1015131078d1..45e48a72d62b74dda45f32700edcebb7aa33c965 100644 (file)
--- a/include/wx/msw/registry.h
+++ b/include/wx/msw/registry.h
@@ -12,10 +12,6 @@
 #ifndef _WX_MSW_REGISTRY_H_
 #define _WX_MSW_REGISTRY_H_
 
 #ifndef _WX_MSW_REGISTRY_H_
 #define _WX_MSW_REGISTRY_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "registry.h"
-#endif
-

 class WXDLLIMPEXP_BASE wxOutputStream;
 
 // ----------------------------------------------------------------------------
 class WXDLLIMPEXP_BASE wxOutputStream;
 
 // ----------------------------------------------------------------------------


@@ -52,16 +48,11 @@ public:
     HKCR,       // classes root
     HKCU,       // current user
     HKLM,       // local machine
     HKCR,       // classes root
     HKCU,       // current user
     HKLM,       // local machine

-    HKUSR       // users
-#ifndef __WXWINCE__
-    ,
-    HKPD        // performance data (WinNT/2K only)
-#endif
-#if WINVER >= 0x0400
-    ,
-    HKCC,       // current config (starting from Win95/NT 4.0)
-    HKDD        // dynamic data (Win95/98 only)
-#endif  // Winver
+    HKUSR,      // users
+    HKPD,       // performance data (WinNT/2K only)
+    HKCC,       // current config
+    HKDD,       // dynamic data (Win95/98 only)
+    HKMAX

   };
 
   // access mode for the key
   };
 
   // access mode for the key


@@ -245,6 +236,7 @@ private:
               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)
 

+  AccessMode  m_mode;           // valid only if key is opened

   long        m_dwLastError;    // last error (0 if none)
 
 
   long        m_dwLastError;    // last error (0 if none)