regenerated after version.bkl changes fixing -compatibility_version for Darwin

[wxWidgets.git] / src / os2 / iniconf.cpp

diff --git a/src/os2/iniconf.cpp b/src/os2/iniconf.cpp
index 05bdb58dd63475ea96a0affafb042b833abfb609..9e01efedbdaf5981636f56d778b0674fd6161281 100644 (file)
--- a/src/os2/iniconf.cpp
+++ b/src/os2/iniconf.cpp
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     10/09/99
 // Copyright:   David Webster
 // Modified by:
 // Created:     10/09/99
 // Copyright:   David Webster

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx.h".
 ///////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx.h".


@@ -58,9 +58,9 @@ wxIniConfig::wxIniConfig(const wxString& strAppName,
                           localFilename, globalFilename, style)
 {
     m_strLocalFilename = localFilename;
                           localFilename, globalFilename, style)
 {
     m_strLocalFilename = localFilename;

-    if (m_strLocalFilename.IsEmpty())
+    if (m_strLocalFilename.empty())

     {
     {

-        m_strLocalFilename = GetAppName() + ".ini";
+        m_strLocalFilename = GetAppName() + wxT(".ini");

     }
 
     // append the extension if none given and it's not an absolute file name
     }
 
     // append the extension if none given and it's not an absolute file name


@@ -68,11 +68,11 @@ wxIniConfig::wxIniConfig(const wxString& strAppName,
     if ( !wxIsPathSeparator(m_strLocalFilename[(size_t) 0]) &&
         m_strLocalFilename.Find('.') == wxNOT_FOUND )
     {
     if ( !wxIsPathSeparator(m_strLocalFilename[(size_t) 0]) &&
         m_strLocalFilename.Find('.') == wxNOT_FOUND )
     {

-        m_strLocalFilename << ".ini";
+        m_strLocalFilename << wxT(".ini");

     }
 
     // set root path
     }
 
     // set root path

-    SetPath("");
+    SetPath(wxT(""));

 }
 
 wxIniConfig::~wxIniConfig()
 }
 
 wxIniConfig::~wxIniConfig()


@@ -85,91 +85,100 @@ wxIniConfig::~wxIniConfig()
 
 void wxIniConfig::SetPath(const wxString& strPath)
 {
 
 void wxIniConfig::SetPath(const wxString& strPath)
 {

-  wxArrayString aParts;
+    wxArrayString aParts;

 
 

-  if ( strPath.IsEmpty() ) {
-    // nothing
-  }
-  else if ( strPath[(size_t) 0] == wxCONFIG_PATH_SEPARATOR ) {
-    // absolute path
-    wxSplitPath(aParts, strPath);
-  }
-  else {
-    // relative path, combine with current one
-    wxString strFullPath = GetPath();
-    strFullPath << wxCONFIG_PATH_SEPARATOR << strPath;
-    wxSplitPath(aParts, strFullPath);
-  }
+    if ( strPath.empty() )
+    {
+        // nothing
+    }
+    else if ( strPath[(size_t) 0] == wxCONFIG_PATH_SEPARATOR )
+    {
+        // absolute path
+        wxSplitPath(aParts, strPath);
+    }
+    else
+    {
+        // relative path, combine with current one
+        wxString strFullPath = GetPath();
+        strFullPath << wxCONFIG_PATH_SEPARATOR << strPath;
+        wxSplitPath(aParts, strFullPath);
+    }

 
 

-  size_t nPartsCount = aParts.Count();
-  m_strPath.Empty();
-  if ( nPartsCount == 0 ) {
-    // go to the root
-    m_strGroup = PATH_SEP_REPLACE;
-  }
-  else {
-    // translate
-    m_strGroup = aParts[(size_t) 0];
-    for ( size_t nPart = 1; nPart < nPartsCount; nPart++ ) {
-      if ( nPart > 1 )
-        m_strPath << PATH_SEP_REPLACE;
-      m_strPath << aParts[nPart];
+    size_t nPartsCount = aParts.Count();
+    m_strPath.Empty();
+    if ( nPartsCount == 0 )
+    {
+        // go to the root
+        m_strGroup = (wxChar*)PATH_SEP_REPLACE;
+    }
+    else
+    {
+        // translate
+        m_strGroup = aParts[(size_t) 0];
+        for ( size_t nPart = 1; nPart < nPartsCount; nPart++ )
+        {
+            if ( nPart > 1 )
+                m_strPath << PATH_SEP_REPLACE;
+            m_strPath << aParts[nPart];
+        }

     }
     }

-  }

 
 

-  // 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) &&
-            (m_strGroup == wxString(PATH_SEP_REPLACE) ||
-             m_strGroup.Last() != PATH_SEP_REPLACE) );
+    // 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.empty() || m_strPath.Last() != PATH_SEP_REPLACE) &&
+              (m_strGroup == wxString((wxChar)PATH_SEP_REPLACE) ||
+               m_strGroup.Last() != PATH_SEP_REPLACE) );

 }
 
 const wxString& wxIniConfig::GetPath() const
 {
 }
 
 const wxString& wxIniConfig::GetPath() const
 {

-  static wxString s_str;
+    static wxString s_str;

 
 

-  // always return abs path
-  s_str = wxCONFIG_PATH_SEPARATOR;
+    // always return abs path
+    s_str = wxCONFIG_PATH_SEPARATOR;

 
 

-  if ( m_strGroup == wxString(PATH_SEP_REPLACE) ) {
-    // we're at the root level, nothing to do
-  }
-  else {
-    s_str << m_strGroup;
-    if ( !m_strPath.IsEmpty() )
-      s_str << wxCONFIG_PATH_SEPARATOR;
-    for ( const char *p = m_strPath; *p != '\0'; p++ ) {
-      s_str << (*p == PATH_SEP_REPLACE ? wxCONFIG_PATH_SEPARATOR : *p);
+    if ( m_strGroup == wxString((wxChar)PATH_SEP_REPLACE) )
+    {
+        // we're at the root level, nothing to do
+    }
+    else
+    {
+        s_str << m_strGroup;
+        if ( !m_strPath.empty() )
+            s_str << wxCONFIG_PATH_SEPARATOR;
+        for ( const wxChar *p = m_strPath; *p != '\0'; p++ )
+        {
+            s_str << (*p == PATH_SEP_REPLACE ? wxCONFIG_PATH_SEPARATOR : *p);
+      }

     }
     }

-  }

 
 

-  return s_str;
+    return s_str;

 }
 
 wxString wxIniConfig::GetPrivateKeyName(const wxString& szKey) const
 {
 }
 
 wxString wxIniConfig::GetPrivateKeyName(const wxString& szKey) const
 {

-  wxString strKey;
+    wxString strKey;

 
 

-  if ( !m_strPath.IsEmpty() )
-    strKey << m_strPath << PATH_SEP_REPLACE;
+    if ( !m_strPath.empty() )
+        strKey << m_strPath << PATH_SEP_REPLACE;

 
 

-  strKey << szKey;
+    strKey << szKey;

 
 

-  return strKey;
+    return strKey;

 }
 
 wxString wxIniConfig::GetKeyName(const wxString& szKey) const
 {
 }
 
 wxString wxIniConfig::GetKeyName(const wxString& szKey) const
 {

-  wxString strKey;
+    wxString strKey;

 
 

-  if ( m_strGroup != wxString(PATH_SEP_REPLACE) )
-    strKey << m_strGroup << PATH_SEP_REPLACE;
-  if ( !m_strPath.IsEmpty() )
-    strKey << m_strPath << PATH_SEP_REPLACE;
+    if (m_strGroup != wxString((wxChar)PATH_SEP_REPLACE))
+        strKey << m_strGroup << PATH_SEP_REPLACE;
+    if ( !m_strPath.empty() )
+        strKey << m_strPath << PATH_SEP_REPLACE;

 
 

-  strKey << szKey;
+    strKey << szKey;

 
 

-  return strKey;
+    return strKey;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -177,32 +186,32 @@ wxString wxIniConfig::GetKeyName(const wxString& szKey) const
 // ----------------------------------------------------------------------------
 
 // not implemented
 // ----------------------------------------------------------------------------
 
 // not implemented

-bool wxIniConfig::GetFirstGroup(wxString& str, long& lIndex) const
+bool wxIniConfig::GetFirstGroup(wxString& WXUNUSED(str), long& WXUNUSED(lIndex)) const

 {
 {

-  wxFAIL_MSG("not implemented");
+    wxFAIL_MSG(wxT("not implemeted"));

 
 

-  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");
+    wxFAIL_MSG(wxT("not implemeted"));

 
 

-  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");
+    wxFAIL_MSG(wxT("not implemeted"));

 
 

-  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");
+    wxFAIL_MSG(wxT("not implemeted"));

 
 

-  return FALSE;
+    return false;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -210,49 +219,49 @@ bool wxIniConfig::GetNextEntry (wxString& str, long& lIndex) const
 // ----------------------------------------------------------------------------
 
 // not implemented
 // ----------------------------------------------------------------------------
 
 // not implemented

-size_t wxIniConfig::GetNumberOfEntries(bool bRecursive) const
+size_t wxIniConfig::GetNumberOfEntries(bool WXUNUSED(bRecursive)) const

 {
 {

-  wxFAIL_MSG("not implemented");
+    wxFAIL_MSG(wxT("not implemeted"));

 
 

-  return (size_t)-1;
+    return (size_t)-1;

 }
 
 }
 

-size_t wxIniConfig::GetNumberOfGroups(bool bRecursive) const
+size_t wxIniConfig::GetNumberOfGroups(bool WXUNUSED(bRecursive)) const

 {
 {

-  wxFAIL_MSG("not implemented");
+    wxFAIL_MSG(wxT("not implemeted"));

 
 

-  return (size_t)-1;
+    return (size_t)-1;

 }
 
 }
 

-bool wxIniConfig::HasGroup(const wxString& strName) const
+bool wxIniConfig::HasGroup(const wxString& WXUNUSED(strName)) const

 {
 {

-  wxFAIL_MSG("not implemented");
+    wxFAIL_MSG(wxT("not implemeted"));

 
 

-  return FALSE;
+    return false;

 }
 
 }
 

-bool wxIniConfig::HasEntry(const wxString& strName) const
+bool wxIniConfig::HasEntry(const wxString& WXUNUSED(strName)) const

 {
 {

-  wxFAIL_MSG("not implemented");
+    wxFAIL_MSG(wxT("not implemeted"));

 
 

-  return FALSE;
+    return false;

 }
 
 // is current group empty?
 bool wxIniConfig::IsEmpty() const
 {
 }
 
 // is current group empty?
 bool wxIniConfig::IsEmpty() const
 {

-  char szBuf[1024];
+    char szBuf[1024];

 
 //  GetPrivateProfileString(m_strGroup, NULL, "",
 //                          szBuf, WXSIZEOF(szBuf), m_strLocalFilename);
 
 //  GetPrivateProfileString(m_strGroup, NULL, "",
 //                          szBuf, WXSIZEOF(szBuf), m_strLocalFilename);

-  if ( !::IsEmpty(szBuf) )
-    return FALSE;
+    if ( !::IsEmpty(szBuf) )
+        return false;

 
 //  GetProfileString(m_strGroup, NULL, "", szBuf, WXSIZEOF(szBuf));
 //  if ( !::IsEmpty(szBuf) )
 
 //  GetProfileString(m_strGroup, NULL, "", szBuf, WXSIZEOF(szBuf));
 //  if ( !::IsEmpty(szBuf) )

-    return FALSE;
+//      return false;

 
 

-  return TRUE;
+    return true;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -261,29 +270,30 @@ bool wxIniConfig::IsEmpty() const
 
 bool wxIniConfig::Read(const wxString& szKey, wxString *pstr) const
 {
 
 bool wxIniConfig::Read(const wxString& szKey, wxString *pstr) const
 {

-  wxConfigPathChanger path(this, szKey);
-  wxString strKey = GetPrivateKeyName(path.Name());
+    wxConfigPathChanger path(this, szKey);
+    wxString strKey = GetPrivateKeyName(path.Name());

 
 

-  char szBuf[1024]; // @@ should dynamically allocate memory...
+    wxChar szBuf[1024]; // @@ should dynamically allocate memory...

 
 

-  // first look in the private INI file
+    // first look in the private INI file

 
 

-  // NB: the lpDefault param to GetPrivateProfileString can't be NULL
+    // NB: the lpDefault param to GetPrivateProfileString can't be NULL

 //  GetPrivateProfileString(m_strGroup, strKey, "",
 //                          szBuf, WXSIZEOF(szBuf), m_strLocalFilename);
 //  GetPrivateProfileString(m_strGroup, strKey, "",
 //                          szBuf, WXSIZEOF(szBuf), m_strLocalFilename);

-  if ( ::IsEmpty(szBuf) ) {
-    // now look in win.ini
-    wxString strKey = GetKeyName(path.Name());
-//    GetProfileString(m_strGroup, strKey, "", szBuf, WXSIZEOF(szBuf));
-  }
+    if ( ::IsEmpty((PSZ)szBuf) )
+    {
+        // now look in win.ini
+        wxString strKey = GetKeyName(path.Name());
+        // GetProfileString(m_strGroup, strKey, "", szBuf, WXSIZEOF(szBuf));
+    }
+
+    if ( ::IsEmpty((PSZ)szBuf) )
+    {
+        return false;
+    }

 
 

-  if ( ::IsEmpty(szBuf) ) {
-    return FALSE;
-  }
-  else {

     *pstr = szBuf ;
     *pstr = szBuf ;

-    return TRUE;
-  }
+    return true;

 }
 
 bool wxIniConfig::Read(const wxString& szKey, wxString *pstr,
 }
 
 bool wxIniConfig::Read(const wxString& szKey, wxString *pstr,


@@ -292,20 +302,20 @@ bool wxIniConfig::Read(const wxString& szKey, wxString *pstr,
   wxConfigPathChanger path(this, szKey);
   wxString strKey = GetPrivateKeyName(path.Name());
 
   wxConfigPathChanger path(this, szKey);
   wxString strKey = GetPrivateKeyName(path.Name());
 

-  char szBuf[1024]; // @@ should dynamically allocate memory...
+  wxChar szBuf[1024]; // @@ should dynamically allocate memory...

 
   // first look in the private INI file
 
   // NB: the lpDefault param to GetPrivateProfileString can't be NULL
 //  GetPrivateProfileString(m_strGroup, strKey, "",
 //                          szBuf, WXSIZEOF(szBuf), m_strLocalFilename);
 
   // first look in the private INI file
 
   // NB: the lpDefault param to GetPrivateProfileString can't be NULL
 //  GetPrivateProfileString(m_strGroup, strKey, "",
 //                          szBuf, WXSIZEOF(szBuf), m_strLocalFilename);

-  if ( ::IsEmpty(szBuf) ) {
+  if ( ::IsEmpty((PSZ)szBuf) ) {

     // now look in win.ini
     wxString strKey = GetKeyName(path.Name());
 //    GetProfileString(m_strGroup, strKey, "", szBuf, WXSIZEOF(szBuf));
   }
 
     // now look in win.ini
     wxString strKey = GetKeyName(path.Name());
 //    GetProfileString(m_strGroup, strKey, "", szBuf, WXSIZEOF(szBuf));
   }
 

-  if ( ::IsEmpty(szBuf) ) {
+  if ( ::IsEmpty((PSZ)szBuf) ) {

     *pstr = szDefault;
     return FALSE;
   }
     *pstr = szDefault;
     return FALSE;
   }


@@ -346,25 +356,25 @@ bool wxIniConfig::Read(const wxString& szKey, long *pl) const
   return TRUE;
 }
 
   return TRUE;
 }
 

-bool wxIniConfig::Write(const wxString& szKey, const wxString& szValue)
+bool wxIniConfig::Write(const wxString& szKey, const wxString& WXUNUSED(szValue))

 {
 {

-  wxConfigPathChanger path(this, szKey);
-  wxString strKey = GetPrivateKeyName(path.Name());
+    wxConfigPathChanger path(this, szKey);
+    wxString strKey = GetPrivateKeyName(path.Name());

 
 

-  bool bOk = FALSE; // = WritePrivateProfileString(m_strGroup, strKey,
+    bool bOk = false; // = WritePrivateProfileString(m_strGroup, strKey,

 //                                       szValue, m_strLocalFilename) != 0;
 
 //                                       szValue, m_strLocalFilename) != 0;
 

-  if ( !bOk )
-    wxLogLastError("WritePrivateProfileString");
+    if ( !bOk )
+        wxLogLastError(wxT("WritePrivateProfileString"));

 
 

-  return bOk;
+    return bOk;

 }
 
 bool wxIniConfig::Write(const wxString& szKey, long lValue)
 {
   // ltoa() is not ANSI :-(
 }
 
 bool wxIniConfig::Write(const wxString& szKey, long lValue)
 {
   // ltoa() is not ANSI :-(

-  char szBuf[40];   // should be good for sizeof(long) <= 16 (128 bits)
-  sprintf(szBuf, "%ld", lValue);
+  wxChar szBuf[40];   // should be good for sizeof(long) <= 16 (128 bits)
+  wxSprintf(szBuf, wxT("%ld"), lValue);

 
   return Write(szKey, szBuf);
 }
 
   return Write(szKey, szBuf);
 }


@@ -400,7 +410,7 @@ bool wxIniConfig::DeleteEntry(const wxString& szKey, bool bGroupIfEmptyAlso)
 //                                       NULL, m_strLocalFilename) != 0;
 
   if ( !bOk )
 //                                       NULL, m_strLocalFilename) != 0;
 
   if ( !bOk )

-    wxLogLastError("WritePrivateProfileString");
+    wxLogLastError(wxT("WritePrivateProfileString"));

 
   return bOk;
 }
 
   return bOk;
 }


@@ -415,7 +425,7 @@ bool wxIniConfig::DeleteGroup(const wxString& szKey)
   //                                     NULL, m_strLocalFilename) != 0;
 
   if ( !bOk )
   //                                     NULL, m_strLocalFilename) != 0;
 
   if ( !bOk )

-    wxLogLastError("WritePrivateProfileString");
+    wxLogLastError(wxT("WritePrivateProfileString"));

 
   return bOk;
 }
 
   return bOk;
 }


@@ -430,19 +440,19 @@ bool wxIniConfig::DeleteAll()
 //  WriteProfileString(GetVendorName(), NULL, NULL);
 
   // then delete our own ini file
 //  WriteProfileString(GetVendorName(), NULL, NULL);
 
   // then delete our own ini file

-  char szBuf[MAX_PATH];
+  wxChar szBuf[MAX_PATH];

   size_t nRc = 0; // = GetWindowsDirectory(szBuf, WXSIZEOF(szBuf));
   if ( nRc == 0 )
   {
   size_t nRc = 0; // = GetWindowsDirectory(szBuf, WXSIZEOF(szBuf));
   if ( nRc == 0 )
   {

-    wxLogLastError("GetWindowsDirectory");
+    wxLogLastError(wxT("GetWindowsDirectory"));

   }
   else if ( nRc > WXSIZEOF(szBuf) )
   {
   }
   else if ( nRc > WXSIZEOF(szBuf) )
   {

-    wxFAIL_MSG("buffer is too small for Windows directory.");
+    wxFAIL_MSG(_("buffer is too small for Windows directory."));

   }
 
   wxString strFile = szBuf;
   }
 
   wxString strFile = szBuf;

-  strFile << '\\' << m_strLocalFilename;
+  strFile << wxT('\\') << m_strLocalFilename;

 
   if ( !wxRemoveFile(strFile) ) {
     wxLogSysError(_("Can't delete the INI file '%s'"), strFile.c_str());
 
   if ( !wxRemoveFile(strFile) ) {
     wxLogSysError(_("Can't delete the INI file '%s'"), strFile.c_str());


@@ -452,16 +462,16 @@ bool wxIniConfig::DeleteAll()
   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
 {
     // 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
 {
     // Not implemented

-    return FALSE;
+    return false;

 }
 
 #endif //wxUSE_CONFIG
 }
 
 #endif //wxUSE_CONFIG