Fixed some warnings

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

diff --git a/src/msw/regconf.cpp b/src/msw/regconf.cpp
index 4d5388cf4cfe49f0e85313051f6a5c0a707258a4..9954bc4503117a9c5b2c947bb4f9ab59b3975938 100644 (file)
--- a/src/msw/regconf.cpp
+++ b/src/msw/regconf.cpp
@@ -16,7 +16,7 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#if wxUSE_CONFIG
+#if wxUSE_CONFIG && wxUSE_REGKEY

 
 #include "wx/config.h"
 
 
 #include "wx/config.h"
 


@@ -79,7 +79,7 @@ wxRegConfig::wxRegConfig(const wxString& appName, const wxString& vendorName,
   bool bDoUseGlobal = (style & wxCONFIG_USE_GLOBAL_FILE) != 0;
 
   // the convention is to put the programs keys under <vendor>\<appname>
   bool bDoUseGlobal = (style & wxCONFIG_USE_GLOBAL_FILE) != 0;
 
   // the convention is to put the programs keys under <vendor>\<appname>

-  // (but it can be overriden by specifying the pathes explicitly in strLocal
+  // (but it can be overridden by specifying the paths explicitly in strLocal

   // and/or strGlobal)
   if ( strLocal.empty() || (strGlobal.empty() && bDoUseGlobal) )
   {
   // and/or strGlobal)
   if ( strLocal.empty() || (strGlobal.empty() && bDoUseGlobal) )
   {


@@ -251,7 +251,7 @@ void wxRegConfig::SetPath(const wxString& strPath)
 
                 // note that we don't have to check for src < end here as
                 // *end == 0 so can't be '.'
 
                 // note that we don't have to check for src < end here as
                 // *end == 0 so can't be '.'

-                if ( src[1] == _T('.') && src[2] == _T('.') &&
+                if ( src[1] == wxT('.') && src[2] == wxT('.') &&

                      (src + 3 == end || src[3] == wxCONFIG_PATH_SEPARATOR) )
                 {
                     if ( !totalSlashes )
                      (src + 3 == end || src[3] == wxCONFIG_PATH_SEPARATOR) )
                 {
                     if ( !totalSlashes )


@@ -286,7 +286,7 @@ void wxRegConfig::SetPath(const wxString& strPath)
 
                         // we must have found a slash one way or another!
                         wxASSERT_MSG( *dst == wxCONFIG_PATH_SEPARATOR,
 
                         // we must have found a slash one way or another!
                         wxASSERT_MSG( *dst == wxCONFIG_PATH_SEPARATOR,

-                                      _T("error in wxRegConfig::SetPath") );
+                                      wxT("error in wxRegConfig::SetPath") );

 
                         // stay at the same position
                         dst--;
 
                         // stay at the same position
                         dst--;


@@ -331,7 +331,7 @@ void wxRegConfig::SetPath(const wxString& strPath)
             dst--;
         }
 
             dst--;
         }
 

-        *dst = _T('\0');
+        *dst = wxT('\0');

         buf.SetLength(dst - start);
     }
 
         buf.SetLength(dst - start);
     }
 


@@ -356,7 +356,7 @@ void wxRegConfig::SetPath(const wxString& strPath)
         for ( ; src < end; src++, dst++ )
         {
             if ( *src == wxCONFIG_PATH_SEPARATOR )
         for ( ; src < end; src++, dst++ )
         {
             if ( *src == wxCONFIG_PATH_SEPARATOR )

-                *dst = _T('\\');
+                *dst = wxT('\\');

             else
                 *dst = *src;
         }
             else
                 *dst = *src;
         }


@@ -556,14 +556,14 @@ wxConfigBase::EntryType wxRegConfig::GetEntryType(const wxString& key) const
 
 bool wxRegConfig::DoReadString(const wxString& key, wxString *pStr) const
 {
 
 bool wxRegConfig::DoReadString(const wxString& key, wxString *pStr) const
 {

-    wxCHECK_MSG( pStr, false, _T("wxRegConfig::Read(): NULL param") );
+    wxCHECK_MSG( pStr, false, wxT("wxRegConfig::Read(): NULL param") );

 
   wxConfigPathChanger path(this, key);
 
   bool bQueryGlobal = true;
 
   // if immutable key exists in global key we must check that it's not
 
   wxConfigPathChanger path(this, key);
 
   bool bQueryGlobal = true;
 
   // if immutable key exists in global key we must check that it's not

-  // overriden by the local key with the same name
+  // overridden by the local key with the same name

   if ( IsImmutable(path.Name()) ) {
     if ( TryGetValue(m_keyGlobal, path.Name(), *pStr) ) {
       if ( m_keyLocal.Exists() && LocalKey().HasValue(path.Name()) ) {
   if ( IsImmutable(path.Name()) ) {
     if ( TryGetValue(m_keyGlobal, path.Name(), *pStr) ) {
       if ( m_keyLocal.Exists() && LocalKey().HasValue(path.Name()) ) {


@@ -593,14 +593,14 @@ bool wxRegConfig::DoReadString(const wxString& key, wxString *pStr) const
 
 bool wxRegConfig::DoReadLong(const wxString& key, long *plResult) const
 {
 
 bool wxRegConfig::DoReadLong(const wxString& key, long *plResult) const
 {

-    wxCHECK_MSG( plResult, false, _T("wxRegConfig::Read(): NULL param") );
+    wxCHECK_MSG( plResult, false, wxT("wxRegConfig::Read(): NULL param") );

 
   wxConfigPathChanger path(this, key);
 
   bool bQueryGlobal = true;
 
   // if immutable key exists in global key we must check that it's not
 
   wxConfigPathChanger path(this, key);
 
   bool bQueryGlobal = true;
 
   // if immutable key exists in global key we must check that it's not

-  // overriden by the local key with the same name
+  // overridden by the local key with the same name

   if ( IsImmutable(path.Name()) ) {
     if ( TryGetValue(m_keyGlobal, path.Name(), plResult) ) {
       if ( m_keyLocal.Exists() && LocalKey().HasValue(path.Name()) ) {
   if ( IsImmutable(path.Name()) ) {
     if ( TryGetValue(m_keyGlobal, path.Name(), plResult) ) {
       if ( m_keyLocal.Exists() && LocalKey().HasValue(path.Name()) ) {


@@ -627,14 +627,14 @@ bool wxRegConfig::DoReadLong(const wxString& key, long *plResult) const
 
 bool wxRegConfig::DoReadBinary(const wxString& key, wxMemoryBuffer *buf) const
 {
 
 bool wxRegConfig::DoReadBinary(const wxString& key, wxMemoryBuffer *buf) const
 {

-    wxCHECK_MSG( buf, false, _T("wxRegConfig::Read(): NULL param") );
+    wxCHECK_MSG( buf, false, wxT("wxRegConfig::Read(): NULL param") );

 
   wxConfigPathChanger path(this, key);
 
   bool bQueryGlobal = true;
 
   // if immutable key exists in global key we must check that it's not
 
   wxConfigPathChanger path(this, key);
 
   bool bQueryGlobal = true;
 
   // if immutable key exists in global key we must check that it's not

-  // overriden by the local key with the same name
+  // overridden by the local key with the same name

   if ( IsImmutable(path.Name()) ) {
     if ( TryGetValue(m_keyGlobal, path.Name(), *buf) ) {
       if ( m_keyLocal.Exists() && LocalKey().HasValue(path.Name()) ) {
   if ( IsImmutable(path.Name()) ) {
     if ( TryGetValue(m_keyGlobal, path.Name(), *buf) ) {
       if ( m_keyLocal.Exists() && LocalKey().HasValue(path.Name()) ) {


@@ -739,7 +739,7 @@ bool wxRegConfig::DeleteEntry(const wxString& value, bool bGroupIfEmptyAlso)
 
     if ( bGroupIfEmptyAlso && m_keyLocal.IsEmpty() ) {
       wxString strKey = GetPath().AfterLast(wxCONFIG_PATH_SEPARATOR);
 
     if ( bGroupIfEmptyAlso && m_keyLocal.IsEmpty() ) {
       wxString strKey = GetPath().AfterLast(wxCONFIG_PATH_SEPARATOR);

-      SetPath(_T(".."));  // changes m_keyLocal
+      SetPath(wxT(".."));  // changes m_keyLocal

       return LocalKey().DeleteKey(strKey);
     }
   }
       return LocalKey().DeleteKey(strKey);
     }
   }


@@ -780,4 +780,4 @@ bool wxRegConfig::DeleteAll()
   return bOk;
 }
 
   return bOk;
 }
 

-#endif // wxUSE_CONFIG
+#endif // wxUSE_CONFIG && wxUSE_REGKEY