X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6c9a19aabab3a878b565e6c2a5f2a3824277c4dc..7e02be855d14263c996448bdb56c9e1002ad9b53:/src/msw/iniconf.cpp

diff --git a/src/msw/iniconf.cpp b/src/msw/iniconf.cpp
index 1ab07f3183..a84b90756a 100644
--- a/src/msw/iniconf.cpp
+++ b/src/msw/iniconf.cpp
@@ -9,10 +9,6 @@
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "iniconf.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -35,13 +31,14 @@
 #include  "wx/dynarray.h"
 #include  "wx/log.h"
 #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  <windows.h>
+  #include  "wx/msw/wrapwin.h"
 #endif  //windows.h
 
 // ----------------------------------------------------------------------------
@@ -95,7 +92,7 @@ wxIniConfig::wxIniConfig(const wxString& strAppName,
     }
 
     // set root path
-    SetPath(wxT(""));
+    SetPath(wxEmptyString);
 }
 
 wxIniConfig::~wxIniConfig()
@@ -200,32 +197,32 @@ wxString wxIniConfig::GetKeyName(const wxString& szKey) const
 // ----------------------------------------------------------------------------
 
 // not implemented
-bool wxIniConfig::GetFirstGroup(wxString& str, long& lIndex) const
+bool wxIniConfig::GetFirstGroup(wxString& WXUNUSED(str), long& WXUNUSED(lIndex)) const
 {
   wxFAIL_MSG("not implemented");
 
-  return FALSE;
+  return false;
 }
 
-bool wxIniConfig::GetNextGroup (wxString& str, long& lIndex) const
+bool wxIniConfig::GetNextGroup (wxString& WXUNUSED(str), long& WXUNUSED(lIndex)) const
 {
   wxFAIL_MSG("not implemented");
 
-  return FALSE;
+  return false;
 }
 
-bool wxIniConfig::GetFirstEntry(wxString& str, long& lIndex) const
+bool wxIniConfig::GetFirstEntry(wxString& WXUNUSED(str), long& WXUNUSED(lIndex)) const
 {
   wxFAIL_MSG("not implemented");
 
-  return FALSE;
+  return false;
 }
 
-bool wxIniConfig::GetNextEntry (wxString& str, long& lIndex) const
+bool wxIniConfig::GetNextEntry (wxString& WXUNUSED(str), long& WXUNUSED(lIndex)) const
 {
   wxFAIL_MSG("not implemented");
 
-  return FALSE;
+  return false;
 }
 
 // ----------------------------------------------------------------------------
@@ -233,32 +230,32 @@ bool wxIniConfig::GetNextEntry (wxString& str, long& lIndex) const
 // ----------------------------------------------------------------------------
 
 // not implemented
-size_t wxIniConfig::GetNumberOfEntries(bool bRecursive) const
+size_t wxIniConfig::GetNumberOfEntries(bool WXUNUSED(bRecursive)) const
 {
   wxFAIL_MSG("not implemented");
 
   return (size_t)-1;
 }
 
-size_t wxIniConfig::GetNumberOfGroups(bool bRecursive) const
+size_t wxIniConfig::GetNumberOfGroups(bool WXUNUSED(bRecursive)) const
 {
   wxFAIL_MSG("not implemented");
 
   return (size_t)-1;
 }
 
-bool wxIniConfig::HasGroup(const wxString& strName) const
+bool wxIniConfig::HasGroup(const wxString& WXUNUSED(strName)) const
 {
   wxFAIL_MSG("not implemented");
 
-  return FALSE;
+  return false;
 }
 
-bool wxIniConfig::HasEntry(const wxString& strName) const
+bool wxIniConfig::HasEntry(const wxString& WXUNUSED(strName)) const
 {
   wxFAIL_MSG("not implemented");
 
-  return FALSE;
+  return false;
 }
 
 // is current group empty?
@@ -269,13 +266,13 @@ bool wxIniConfig::IsEmpty() const
   GetPrivateProfileString(m_strGroup, NULL, "",
                           szBuf, WXSIZEOF(szBuf), m_strLocalFilename);
   if ( !::IsEmpty(szBuf) )
-    return FALSE;
+    return false;
 
   GetProfileString(m_strGroup, NULL, "", szBuf, WXSIZEOF(szBuf));
   if ( !::IsEmpty(szBuf) )
-    return FALSE;
+    return false;
 
-  return TRUE;
+  return true;
 }
 
 // ----------------------------------------------------------------------------
@@ -301,10 +298,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 +318,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 +326,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 +336,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 +377,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,24 +436,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& oldName, const wxString& newName)
+bool wxIniConfig::RenameEntry(const wxString& WXUNUSED(oldName),
+                              const wxString& WXUNUSED(newName))
 {
     // Not implemented
-    return FALSE;
+    return false;
 }
 
-bool wxIniConfig::RenameGroup(const wxString& oldName, const wxString& newName)
+bool wxIniConfig::RenameGroup(const wxString& WXUNUSED(oldName),
+                              const wxString& WXUNUSED(newName))
 {
     // Not implemented
-    return FALSE;
+    return false;
 }
 
 #endif