X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/de564874d60233c977c93496da1aa406245c37c2..315ebf688c0e69bed47cd3149158198b781b5f65:/src/msw/regconf.cpp

diff --git a/src/msw/regconf.cpp b/src/msw/regconf.cpp
index 2a5325bc15..af4dc5ab68 100644
--- a/src/msw/regconf.cpp
+++ b/src/msw/regconf.cpp
@@ -9,7 +9,7 @@
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "regconf.h"
 #endif
 
@@ -386,13 +386,14 @@ void wxRegConfig::SetPath(const wxString& strPath)
 
     // change current key(s)
     m_keyLocal.SetName(m_keyLocalRoot, strRegPath);
-    m_keyGlobal.SetName(m_keyGlobalRoot, strRegPath);
 
-    // don't create it right now, wait until it is accessed
-    //m_keyLocal.Create();
+    if ( GetStyle() & wxCONFIG_USE_GLOBAL_FILE )
+    {
+      m_keyGlobal.SetName(m_keyGlobalRoot, strRegPath);
 
-    wxLogNull nolog;
-    m_keyGlobal.Open();
+      wxLogNull nolog;
+      m_keyGlobal.Open();
+    }
 }
 
 // ----------------------------------------------------------------------------