X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2eb10e2a17a02acaaa32a41304243999f3a862a1..2121eb69fa8d49f4484f7170159e61f2e8885de4:/src/msw/iniconf.cpp

diff --git a/src/msw/iniconf.cpp b/src/msw/iniconf.cpp
index 9200b5263d..cce629bbc2 100644
--- a/src/msw/iniconf.cpp
+++ b/src/msw/iniconf.cpp
@@ -9,41 +9,33 @@
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "iniconf.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+    #pragma hdrstop
 #endif
 
-#ifndef   WX_PRECOMP
-  #include  "wx/string.h"
-  #include  "wx/intl.h"
-  #include  "wx/event.h"
-  #include  "wx/app.h"
-  #include  "wx/utils.h"
-#endif  //WX_PRECOMP
-
 // Doesn't yet compile in Unicode mode
 
 #if wxUSE_CONFIG && !wxUSE_UNICODE
 
-#include  "wx/dynarray.h"
-#include  "wx/log.h"
+#ifndef   WX_PRECOMP
+    #include "wx/msw/wrapwin.h"
+    #include "wx/dynarray.h"
+    #include "wx/string.h"
+    #include "wx/intl.h"
+    #include "wx/event.h"
+    #include "wx/app.h"
+    #include "wx/utils.h"
+    #include "wx/log.h"
+#endif  //WX_PRECOMP
+
 #include  "wx/config.h"
+#include  "wx/file.h"
 
 #include  "wx/msw/iniconf.h"
 
-// _WINDOWS_ is defined when windows.h is included,
-// __WXMSW__ is defined for MS Windows compilation
-#if       defined(__WXMSW__) && !defined(_WINDOWS_)
-  #include  "wx/msw/wrapwin.h"
-#endif  //windows.h
-
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
@@ -67,21 +59,21 @@ wxIniConfig::wxIniConfig(const wxString& strAppName,
            : wxConfigBase(strAppName, strVendor, localFilename, globalFilename, style)
 
 #if 0 // This is too complex for some compilers, e.g. BC++ 5.01
-           : wxConfigBase((strAppName.IsEmpty() && wxTheApp) ? wxTheApp->GetAppName()
+           : wxConfigBase((strAppName.empty() && wxTheApp) ? wxTheApp->GetAppName()
                                                : strAppName,
-                          strVendor.IsEmpty() ? (wxTheApp ? wxTheApp->GetVendorName()
+                          strVendor.empty() ? (wxTheApp ? wxTheApp->GetVendorName()
                                                   : strAppName)
                                       : strVendor,
                           localFilename, globalFilename, style)
 #endif
 {
-    if (strAppName.IsEmpty() && wxTheApp)
+    if (strAppName.empty() && wxTheApp)
         SetAppName(wxTheApp->GetAppName());
-    if (strVendor.IsEmpty() && wxTheApp)
+    if (strVendor.empty() && wxTheApp)
         SetVendorName(wxTheApp->GetVendorName());
 
     m_strLocalFilename = localFilename;
-    if (m_strLocalFilename.IsEmpty())
+    if (m_strLocalFilename.empty())
     {
         m_strLocalFilename = GetAppName() + wxT(".ini");
     }
@@ -110,7 +102,7 @@ void wxIniConfig::SetPath(const wxString& strPath)
 {
   wxArrayString aParts;
 
-  if ( strPath.IsEmpty() ) {
+  if ( strPath.empty() ) {
     // nothing
   }
   else if ( strPath[0u] == wxCONFIG_PATH_SEPARATOR ) {
@@ -142,7 +134,7 @@ void wxIniConfig::SetPath(const wxString& strPath)
 
   // other functions assume that all this is true, i.e. there are no trailing
   // underscores at the end except if the group is the root one
-  wxASSERT( (m_strPath.IsEmpty() || m_strPath.Last() != PATH_SEP_REPLACE) &&
+  wxASSERT( (m_strPath.empty() || m_strPath.Last() != PATH_SEP_REPLACE) &&
             (m_strGroup == wxString(PATH_SEP_REPLACE) ||
              m_strGroup.Last() != PATH_SEP_REPLACE) );
 }
@@ -159,7 +151,7 @@ const wxString& wxIniConfig::GetPath() const
   }
   else {
     s_str << m_strGroup;
-    if ( !m_strPath.IsEmpty() )
+    if ( !m_strPath.empty() )
       s_str << wxCONFIG_PATH_SEPARATOR;
     for ( const char *p = m_strPath; *p != '\0'; p++ ) {
       s_str << (*p == PATH_SEP_REPLACE ? wxCONFIG_PATH_SEPARATOR : *p);
@@ -173,7 +165,7 @@ wxString wxIniConfig::GetPrivateKeyName(const wxString& szKey) const
 {
   wxString strKey;
 
-  if ( !m_strPath.IsEmpty() )
+  if ( !m_strPath.empty() )
     strKey << m_strPath << PATH_SEP_REPLACE;
 
   strKey << szKey;
@@ -187,7 +179,7 @@ wxString wxIniConfig::GetKeyName(const wxString& szKey) const
 
   if ( m_strGroup != wxString(PATH_SEP_REPLACE) )
     strKey << m_strGroup << PATH_SEP_REPLACE;
-  if ( !m_strPath.IsEmpty() )
+  if ( !m_strPath.empty() )
     strKey << m_strPath << PATH_SEP_REPLACE;
 
   strKey << szKey;
@@ -202,30 +194,30 @@ wxString wxIniConfig::GetKeyName(const wxString& szKey) const
 // not implemented
 bool wxIniConfig::GetFirstGroup(wxString& WXUNUSED(str), long& WXUNUSED(lIndex)) const
 {
-  wxFAIL_MSG("not implemented");
+    wxFAIL_MSG("not implemented");
 
-  return FALSE;
+    return false;
 }
 
 bool wxIniConfig::GetNextGroup (wxString& WXUNUSED(str), long& WXUNUSED(lIndex)) const
 {
-  wxFAIL_MSG("not implemented");
+    wxFAIL_MSG("not implemented");
 
-  return FALSE;
+    return false;
 }
 
 bool wxIniConfig::GetFirstEntry(wxString& WXUNUSED(str), long& WXUNUSED(lIndex)) const
 {
-  wxFAIL_MSG("not implemented");
+    wxFAIL_MSG("not implemented");
 
-  return FALSE;
+    return false;
 }
 
 bool wxIniConfig::GetNextEntry (wxString& WXUNUSED(str), long& WXUNUSED(lIndex)) const
 {
-  wxFAIL_MSG("not implemented");
+    wxFAIL_MSG("not implemented");
 
-  return FALSE;
+    return false;
 }
 
 // ----------------------------------------------------------------------------
@@ -235,47 +227,47 @@ bool wxIniConfig::GetNextEntry (wxString& WXUNUSED(str), long& WXUNUSED(lIndex))
 // not implemented
 size_t wxIniConfig::GetNumberOfEntries(bool WXUNUSED(bRecursive)) const
 {
-  wxFAIL_MSG("not implemented");
+    wxFAIL_MSG("not implemented");
 
-  return (size_t)-1;
+    return (size_t)-1;
 }
 
 size_t wxIniConfig::GetNumberOfGroups(bool WXUNUSED(bRecursive)) const
 {
-  wxFAIL_MSG("not implemented");
+    wxFAIL_MSG("not implemented");
 
-  return (size_t)-1;
+    return (size_t)-1;
 }
 
 bool wxIniConfig::HasGroup(const wxString& WXUNUSED(strName)) const
 {
-  wxFAIL_MSG("not implemented");
+    wxFAIL_MSG("not implemented");
 
-  return FALSE;
+    return false;
 }
 
 bool wxIniConfig::HasEntry(const wxString& WXUNUSED(strName)) const
 {
-  wxFAIL_MSG("not implemented");
+    wxFAIL_MSG("not implemented");
 
-  return FALSE;
+    return false;
 }
 
 // is current group empty?
 bool wxIniConfig::IsEmpty() const
 {
-  char szBuf[1024];
+    char szBuf[1024];
 
-  GetPrivateProfileString(m_strGroup, NULL, "",
-                          szBuf, WXSIZEOF(szBuf), m_strLocalFilename);
-  if ( !::IsEmpty(szBuf) )
-    return FALSE;
+    GetPrivateProfileString(m_strGroup, NULL, "",
+                            szBuf, WXSIZEOF(szBuf), m_strLocalFilename);
+    if ( !::IsEmpty(szBuf) )
+        return false;
 
-  GetProfileString(m_strGroup, NULL, "", szBuf, WXSIZEOF(szBuf));
-  if ( !::IsEmpty(szBuf) )
-    return FALSE;
+    GetProfileString(m_strGroup, NULL, "", szBuf, WXSIZEOF(szBuf));
+    if ( !::IsEmpty(szBuf) )
+        return false;
 
-  return TRUE;
+    return true;
 }
 
 // ----------------------------------------------------------------------------
@@ -301,10 +293,10 @@ bool wxIniConfig::DoReadString(const wxString& szKey, wxString *pstr) const
   }
 
   if ( ::IsEmpty(szBuf) )
-    return FALSE;
+    return false;
 
   *pstr = szBuf;
-  return TRUE;
+  return true;
 }
 
 bool wxIniConfig::DoReadLong(const wxString& szKey, long *pl) const
@@ -321,7 +313,7 @@ bool wxIniConfig::DoReadLong(const wxString& szKey, long *pl) const
   if ( lVal != nMagic ) {
     // the value was read from the file
     *pl = lVal;
-    return TRUE;
+    return true;
   }
 
   // is it really nMagic?
@@ -329,7 +321,7 @@ bool wxIniConfig::DoReadLong(const wxString& szKey, long *pl) const
   if ( lVal != nMagic2 ) {
     // the nMagic it returned was indeed read from the file
     *pl = lVal;
-    return TRUE;
+    return true;
   }
 
   // CS : I have no idea why they should look up in win.ini
@@ -339,9 +331,9 @@ bool wxIniConfig::DoReadLong(const wxString& szKey, long *pl) const
   // no, it was just returning the default value, so now look in win.ini
  *pl = GetProfileInt(GetVendorName(), GetKeyName(szKey), *pl);
 
-  return TRUE;
+  return true;
 #endif
-  return FALSE ;
+  return false ;
 }
 
 bool wxIniConfig::DoWriteString(const wxString& szKey, const wxString& szValue)
@@ -380,17 +372,15 @@ bool wxIniConfig::Flush(bool /* bCurrentOnly */)
 bool wxIniConfig::DeleteEntry(const wxString& szKey, bool bGroupIfEmptyAlso)
 {
   // passing NULL as value to WritePrivateProfileString deletes the key
-//  if ( !Write(szKey, (const char *)NULL) )
-//    return FALSE;
   wxConfigPathChanger path(this, szKey);
   wxString strKey = GetPrivateKeyName(path.Name());
 
-  if (WritePrivateProfileString(m_strGroup, szKey,
+  if (WritePrivateProfileString(m_strGroup, strKey,
                                          (const char*) NULL, m_strLocalFilename) == 0)
-    return FALSE;
+    return false;
 
   if ( !bGroupIfEmptyAlso || !IsEmpty() )
-    return TRUE;
+    return true;
 
   // delete the current group too
   bool bOk = WritePrivateProfileString(m_strGroup, NULL,
@@ -441,26 +431,26 @@ bool wxIniConfig::DeleteAll()
   wxString strFile = szBuf;
   strFile << '\\' << m_strLocalFilename;
 
-  if ( !wxRemoveFile(strFile) ) {
+  if ( wxFile::Exists(strFile) && !wxRemoveFile(strFile) ) {
     wxLogSysError(_("Can't delete the INI file '%s'"), strFile.c_str());
-    return FALSE;
+    return false;
   }
 
-  return TRUE;
+  return true;
 }
 
 bool wxIniConfig::RenameEntry(const wxString& WXUNUSED(oldName),
                               const wxString& WXUNUSED(newName))
 {
     // Not implemented
-    return FALSE;
+    return false;
 }
 
 bool wxIniConfig::RenameGroup(const wxString& WXUNUSED(oldName),
                               const wxString& WXUNUSED(newName))
 {
     // Not implemented
-    return FALSE;
+    return false;
 }
 
 #endif