// 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
+#if wxUSE_INICONF
+
#ifndef WX_PRECOMP
- #include "wx/string.h"
- #include "wx/intl.h"
- #include "wx/event.h"
- #include "wx/app.h"
- #include "wx/utils.h"
+ #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
-// Doesn't yet compile in Unicode mode
-
-#if wxUSE_CONFIG && !wxUSE_UNICODE
-
-#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>
-#endif //windows.h
-
// ----------------------------------------------------------------------------
// constants
// ----------------------------------------------------------------------------
// ----------------------------------------------------------------------------
// ctor & dtor
// ----------------------------------------------------------------------------
+IMPLEMENT_ABSTRACT_CLASS(wxIniConfig, wxConfigBase)
wxIniConfig::wxIniConfig(const wxString& strAppName,
const wxString& strVendor,
: 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");
}
{
wxArrayString aParts;
- if ( strPath.IsEmpty() ) {
+ if ( strPath.empty() ) {
// nothing
}
else if ( strPath[0u] == wxCONFIG_PATH_SEPARATOR ) {
// 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) );
}
}
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++ ) {
+ for ( const wxStringCharType *p = m_strPath.wx_str(); *p != '\0'; p++ ) {
s_str << (*p == PATH_SEP_REPLACE ? wxCONFIG_PATH_SEPARATOR : *p);
}
}
{
wxString strKey;
- if ( !m_strPath.IsEmpty() )
+ if ( !m_strPath.empty() )
strKey << m_strPath << PATH_SEP_REPLACE;
strKey << szKey;
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;
// ----------------------------------------------------------------------------
// 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("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");
+ 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");
+ 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");
+ wxFAIL_MSG("not implemented");
- return FALSE;
+ return false;
}
// ----------------------------------------------------------------------------
// ----------------------------------------------------------------------------
// not implemented
-size_t wxIniConfig::GetNumberOfEntries(bool bRecursive) const
+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 bRecursive) const
+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& strName) const
+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& strName) const
+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];
+ wxChar szBuf[1024];
- GetPrivateProfileString(m_strGroup, NULL, "",
- szBuf, WXSIZEOF(szBuf), m_strLocalFilename);
- if ( !::IsEmpty(szBuf) )
- return FALSE;
+ GetPrivateProfileString(m_strGroup.t_str(), NULL, wxT(""),
+ szBuf, WXSIZEOF(szBuf),
+ m_strLocalFilename.t_str());
+ if ( !wxIsEmpty(szBuf) )
+ return false;
- GetProfileString(m_strGroup, NULL, "", szBuf, WXSIZEOF(szBuf));
- if ( !::IsEmpty(szBuf) )
- return FALSE;
+ GetProfileString(m_strGroup.t_str(), NULL, wxT(""), szBuf, WXSIZEOF(szBuf));
+ if ( !wxIsEmpty(szBuf) )
+ return false;
- return TRUE;
+ return true;
}
// ----------------------------------------------------------------------------
wxConfigPathChanger path(this, szKey);
wxString strKey = GetPrivateKeyName(path.Name());
- char szBuf[1024]; // @@ should dynamically allocate memory...
+ wxChar szBuf[1024]; // FIXME: 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);
- if ( ::IsEmpty(szBuf) ) {
+ GetPrivateProfileString(m_strGroup.t_str(), strKey.t_str(), wxT(""),
+ szBuf, WXSIZEOF(szBuf),
+ m_strLocalFilename.t_str());
+ if ( wxIsEmpty(szBuf) ) {
// now look in win.ini
wxString strKey = GetKeyName(path.Name());
- GetProfileString(m_strGroup, strKey, "", szBuf, WXSIZEOF(szBuf));
+ GetProfileString(m_strGroup.t_str(), strKey.t_str(),
+ wxT(""), szBuf, WXSIZEOF(szBuf));
}
- if ( ::IsEmpty(szBuf) )
- return FALSE;
+ if ( wxIsEmpty(szBuf) )
+ return false;
*pstr = szBuf;
- return TRUE;
+ return true;
}
bool wxIniConfig::DoReadLong(const wxString& szKey, long *pl) const
static const int nMagic = 17; // 17 is some "rare" number
static const int nMagic2 = 28; // arbitrary number != nMagic
- long lVal = GetPrivateProfileInt(m_strGroup, strKey, nMagic, m_strLocalFilename);
+ long lVal = GetPrivateProfileInt(m_strGroup.t_str(), strKey.t_str(),
+ nMagic, m_strLocalFilename.t_str());
if ( lVal != nMagic ) {
// the value was read from the file
*pl = lVal;
- return TRUE;
+ return true;
}
// is it really nMagic?
- lVal = GetPrivateProfileInt(m_strGroup, strKey, nMagic2, m_strLocalFilename);
+ lVal = GetPrivateProfileInt(m_strGroup.t_str(), strKey.t_str(),
+ nMagic2, m_strLocalFilename.t_str());
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
// 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)
wxConfigPathChanger path(this, szKey);
wxString strKey = GetPrivateKeyName(path.Name());
- bool bOk = WritePrivateProfileString(m_strGroup, strKey,
- szValue, m_strLocalFilename) != 0;
+ bool bOk = WritePrivateProfileString(m_strGroup.t_str(), strKey.t_str(),
+ szValue.t_str(),
+ m_strLocalFilename.t_str()) != 0;
if ( !bOk )
+ {
wxLogLastError(wxT("WritePrivateProfileString"));
+ }
return bOk;
}
bool wxIniConfig::DoWriteLong(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);
+ return Write(szKey, wxString::Format(wxT("%ld"), lValue));
+}
+
+bool wxIniConfig::DoReadBinary(const wxString& WXUNUSED(key),
+ wxMemoryBuffer * WXUNUSED(buf)) const
+{
+ wxFAIL_MSG("not implemented");
+
+ return false;
+}
+
+bool wxIniConfig::DoWriteBinary(const wxString& WXUNUSED(key),
+ const wxMemoryBuffer& WXUNUSED(buf))
+{
+ wxFAIL_MSG("not implemented");
- return Write(szKey, szBuf);
+ return false;
}
bool wxIniConfig::Flush(bool /* bCurrentOnly */)
{
// this is just the way it works
- return WritePrivateProfileString(NULL, NULL, NULL, m_strLocalFilename) != 0;
+ return WritePrivateProfileString(NULL, NULL, NULL,
+ m_strLocalFilename.t_str()) != 0;
}
// ----------------------------------------------------------------------------
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,
- (const char*) NULL, m_strLocalFilename) == 0)
- return FALSE;
+ if (WritePrivateProfileString(m_strGroup.t_str(), strKey.t_str(),
+ NULL, m_strLocalFilename.t_str()) == 0)
+ return false;
if ( !bGroupIfEmptyAlso || !IsEmpty() )
- return TRUE;
+ return true;
// delete the current group too
- bool bOk = WritePrivateProfileString(m_strGroup, NULL,
- NULL, m_strLocalFilename) != 0;
+ bool bOk = WritePrivateProfileString(m_strGroup.t_str(), NULL,
+ NULL, m_strLocalFilename.t_str()) != 0;
if ( !bOk )
+ {
wxLogLastError(wxT("WritePrivateProfileString"));
+ }
return bOk;
}
// passing NULL as section name to WritePrivateProfileString deletes the
// whole section according to the docs
- bool bOk = WritePrivateProfileString(path.Name(), NULL,
- NULL, m_strLocalFilename) != 0;
+ bool bOk = WritePrivateProfileString(path.Name().t_str(), NULL,
+ NULL, m_strLocalFilename.t_str()) != 0;
if ( !bOk )
+ {
wxLogLastError(wxT("WritePrivateProfileString"));
+ }
return bOk;
}
bool wxIniConfig::DeleteAll()
{
// first delete our group in win.ini
- WriteProfileString(GetVendorName(), NULL, NULL);
+ WriteProfileString(GetVendorName().t_str(), NULL, NULL);
// then delete our own ini file
- char szBuf[MAX_PATH];
+ wxChar szBuf[MAX_PATH];
size_t nRc = GetWindowsDirectory(szBuf, WXSIZEOF(szBuf));
if ( nRc == 0 )
{
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
- // wxUSE_CONFIG && wxUSE_UNICODE
+#endif // wxUSE_INICONF
projects / wxWidgets.git / blobdiff