implemented wxTE_RIGHT, wxTE_CENTRE for wxGTK2 (patch 957687)

[wxWidgets.git] / src / msw / regconf.cpp

diff --git a/src/msw/regconf.cpp b/src/msw/regconf.cpp
index 8428fb5341bdd5dd09d8f46c6f9e74e80ac047b1..cb302531f976372622a38891e33c5b631be3d806 100644 (file)
--- a/src/msw/regconf.cpp
+++ b/src/msw/regconf.cpp
@@ -33,8 +33,6 @@
 
 #include "wx/config.h"
 
 
 #include "wx/config.h"
 

-#ifndef __WIN16__
-

 #include "wx/msw/registry.h"
 #include "wx/msw/regconf.h"
 
 #include "wx/msw/registry.h"
 #include "wx/msw/regconf.h"
 


@@ -148,8 +146,8 @@ wxRegConfig::wxRegConfig(const wxString& appName, const wxString& vendorName,
   if ( bDoUseGlobal )
   {
     wxLogNull nolog;
   if ( bDoUseGlobal )
   {
     wxLogNull nolog;

-    m_keyGlobalRoot.Open();
-    m_keyGlobal.Open();
+    m_keyGlobalRoot.Open(wxRegKey::Read);
+    m_keyGlobal.Open(wxRegKey::Read);

   }
 }
 
   }
 }
 


@@ -392,7 +390,7 @@ void wxRegConfig::SetPath(const wxString& strPath)
       m_keyGlobal.SetName(m_keyGlobalRoot, strRegPath);
 
       wxLogNull nolog;
       m_keyGlobal.SetName(m_keyGlobalRoot, strRegPath);
 
       wxLogNull nolog;

-      m_keyGlobal.Open();
+      m_keyGlobal.Open(wxRegKey::Read);

     }
 }
 
     }
 }
 


@@ -729,8 +727,5 @@ bool wxRegConfig::DeleteAll()
   return bOk;
 }
 
   return bOk;
 }
 

-#endif
-  // __WIN16__
-

 #endif
   // wxUSE_CONFIG
 #endif
   // wxUSE_CONFIG