non-PCH build fix (according to Tinderbox).

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

diff --git a/src/msw/registry.cpp b/src/msw/registry.cpp
index 37391757287308a5a0f059b0c0c85b2193fa116b..ff832de32d59c09a4f3f46fe6c0319c1df6e998e 100644 (file)
--- a/src/msw/registry.cpp
+++ b/src/msw/registry.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        msw/registry.cpp
+// Name:        src/msw/registry.cpp

 // Purpose:     implementation of registry classes and functions
 // Author:      Vadim Zeitlin
 // Modified by:
 // Purpose:     implementation of registry classes and functions
 // Author:      Vadim Zeitlin
 // Modified by:


@@ -16,19 +16,20 @@
 #include  "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include  "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

-// other wxWidgets headers
-#include  "wx/string.h"
-#include  "wx/intl.h"
-#include  "wx/log.h"
-#include  "wx/file.h"
-#include  "wx/wfstream.h"
+#ifndef WX_PRECOMP
+    #include "wx/msw/wrapwin.h"
+    #include "wx/string.h"
+    #include "wx/intl.h"
+    #include "wx/log.h"
+#endif

 
 

-// Windows headers
-#include  "wx/msw/wrapwin.h"
+#include "wx/file.h"
+#include "wx/wfstream.h"

 
 

+// Windows headers

 #ifdef __WXWINCE__
 #include "wx/msw/private.h"
 #include <winbase.h>
 #ifdef __WXWINCE__
 #include "wx/msw/private.h"
 #include <winbase.h>


@@ -142,12 +143,10 @@ wxRegKey::StdKey wxRegKey::ExtractKeyName(wxString& strKey)
 {
   wxString strRoot = strKey.BeforeFirst(REG_SEPARATOR);
 
 {
   wxString strRoot = strKey.BeforeFirst(REG_SEPARATOR);
 

-  HKEY hRootKey = 0;

   size_t ui;
   for ( ui = 0; ui < nStdKeys; ui++ ) {
     if ( strRoot.CmpNoCase(aStdKeys[ui].szName) == 0 ||
          strRoot.CmpNoCase(aStdKeys[ui].szShortName) == 0 ) {
   size_t ui;
   for ( ui = 0; ui < nStdKeys; ui++ ) {
     if ( strRoot.CmpNoCase(aStdKeys[ui].szName) == 0 ||
          strRoot.CmpNoCase(aStdKeys[ui].szShortName) == 0 ) {

-      hRootKey = aStdKeys[ui].hkey;

       break;
     }
   }
       break;
     }
   }


@@ -155,7 +154,7 @@ wxRegKey::StdKey wxRegKey::ExtractKeyName(wxString& strKey)
   if ( ui == nStdKeys ) {
     wxFAIL_MSG(wxT("invalid key prefix in wxRegKey::ExtractKeyName."));
 
   if ( ui == nStdKeys ) {
     wxFAIL_MSG(wxT("invalid key prefix in wxRegKey::ExtractKeyName."));
 

-    hRootKey = HKEY_CLASSES_ROOT;
+    ui = HKCR;

   }
   else {
     strKey = strKey.After(REG_SEPARATOR);
   }
   else {
     strKey = strKey.After(REG_SEPARATOR);


@@ -163,13 +162,13 @@ wxRegKey::StdKey wxRegKey::ExtractKeyName(wxString& strKey)
       strKey.Truncate(strKey.Len() - 1);
   }
 
       strKey.Truncate(strKey.Len() - 1);
   }
 

-  return (wxRegKey::StdKey)(int)hRootKey;
+  return (StdKey)ui;

 }
 
 wxRegKey::StdKey wxRegKey::GetStdKeyFromHkey(WXHKEY hkey)
 {
   for ( size_t ui = 0; ui < nStdKeys; ui++ ) {
 }
 
 wxRegKey::StdKey wxRegKey::GetStdKeyFromHkey(WXHKEY hkey)
 {
   for ( size_t ui = 0; ui < nStdKeys; ui++ ) {

-    if ( (int) aStdKeys[ui].hkey == (int) hkey )
+    if ( aStdKeys[ui].hkey == (HKEY)hkey )

       return (StdKey)ui;
   }
 
       return (StdKey)ui;
   }
 


@@ -897,7 +896,7 @@ bool wxRegKey::QueryValue(const wxChar *szValue,
     {
 
         // first get the type and size of the data
     {
 
         // first get the type and size of the data

-        DWORD dwType, dwSize;
+        DWORD dwType=REG_NONE, dwSize=0;

         m_dwLastError = RegQueryValueEx((HKEY) m_hKey, WXSTRINGCAST szValue, RESERVED,
                                         &dwType, NULL, &dwSize);
         if ( m_dwLastError == ERROR_SUCCESS )
         m_dwLastError = RegQueryValueEx((HKEY) m_hKey, WXSTRINGCAST szValue, RESERVED,
                                         &dwType, NULL, &dwSize);
         if ( m_dwLastError == ERROR_SUCCESS )


@@ -1413,4 +1412,3 @@ void RemoveTrailingSeparator(wxString& str)
   if ( !str.empty() && str.Last() == REG_SEPARATOR )
     str.Truncate(str.Len() - 1);
 }
   if ( !str.empty() && str.Last() == REG_SEPARATOR )
     str.Truncate(str.Len() - 1);
 }

-