// Created: 27.07.98
// RCS-ID: $Id$
// Copyright: (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence: wxWindows license
+// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "iniconf.h"
#endif
#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"
#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
// ----------------------------------------------------------------------------
const wxString& localFilename,
const wxString& globalFilename,
long style)
- : wxConfigBase(!strAppName && wxTheApp ? wxTheApp->GetAppName()
+ : 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()
: strAppName,
- !strVendor ? (wxTheApp ? wxTheApp->GetVendorName()
+ strVendor.IsEmpty() ? (wxTheApp ? wxTheApp->GetVendorName()
: strAppName)
: strVendor,
localFilename, globalFilename, style)
+#endif
{
+ if (strAppName.IsEmpty() && wxTheApp)
+ SetAppName(wxTheApp->GetAppName());
+ if (strVendor.IsEmpty() && wxTheApp)
+ SetVendorName(wxTheApp->GetVendorName());
+
m_strLocalFilename = localFilename;
if (m_strLocalFilename.IsEmpty())
{
- m_strLocalFilename = GetAppName() + ".ini";
+ m_strLocalFilename = GetAppName() + wxT(".ini");
}
// append the extension if none given and it's not an absolute file name
// (otherwise we assume that they know what they're doing)
if ( !wxIsPathSeparator(m_strLocalFilename[0u]) &&
- m_strLocalFilename.Find('.') == wxNOT_FOUND )
+ m_strLocalFilename.Find(wxT('.')) == wxNOT_FOUND )
{
- m_strLocalFilename << ".ini";
+ m_strLocalFilename << wxT(".ini");
}
// set root path
- SetPath("");
+ SetPath(wxEmptyString);
}
wxIniConfig::~wxIniConfig()
// ----------------------------------------------------------------------------
// 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;
}
-bool wxIniConfig::GetNextGroup (wxString& str, long& lIndex) const
+bool wxIniConfig::GetNextGroup (wxString& WXUNUSED(str), long& WXUNUSED(lIndex)) const
{
wxFAIL_MSG("not implemented");
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;
}
-bool wxIniConfig::GetNextEntry (wxString& str, long& lIndex) const
+bool wxIniConfig::GetNextEntry (wxString& WXUNUSED(str), long& WXUNUSED(lIndex)) const
{
wxFAIL_MSG("not implemented");
// ----------------------------------------------------------------------------
// 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;
}
-bool wxIniConfig::HasEntry(const wxString& strName) const
+bool wxIniConfig::HasEntry(const wxString& WXUNUSED(strName)) const
{
wxFAIL_MSG("not implemented");
// read/write
// ----------------------------------------------------------------------------
-bool wxIniConfig::Read(const wxString& szKey, wxString *pstr) const
+bool wxIniConfig::DoReadString(const wxString& szKey, wxString *pstr) const
{
wxConfigPathChanger path(this, szKey);
wxString strKey = GetPrivateKeyName(path.Name());
GetProfileString(m_strGroup, strKey, "", szBuf, WXSIZEOF(szBuf));
}
- if ( ::IsEmpty(szBuf) ) {
+ if ( ::IsEmpty(szBuf) )
return FALSE;
- }
- else {
- *pstr = szBuf ;
- return TRUE;
- }
-}
-
-bool wxIniConfig::Read(const wxString& szKey, wxString *pstr,
- const wxString& szDefault) const
-{
- wxConfigPathChanger path(this, szKey);
- wxString strKey = GetPrivateKeyName(path.Name());
-
- char 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);
- if ( ::IsEmpty(szBuf) ) {
- // now look in win.ini
- wxString strKey = GetKeyName(path.Name());
- GetProfileString(m_strGroup, strKey, "", szBuf, WXSIZEOF(szBuf));
- }
-
- if ( ::IsEmpty(szBuf) ) {
- *pstr = szDefault;
- return FALSE;
- }
- else {
- *pstr = szBuf ;
- return TRUE;
- }
+ *pstr = szBuf;
+ return TRUE;
}
-bool wxIniConfig::Read(const wxString& szKey, long *pl) const
+bool wxIniConfig::DoReadLong(const wxString& szKey, long *pl) const
{
wxConfigPathChanger path(this, szKey);
wxString strKey = GetPrivateKeyName(path.Name());
return FALSE ;
}
-bool wxIniConfig::Write(const wxString& szKey, const wxString& szValue)
+bool wxIniConfig::DoWriteString(const wxString& szKey, const wxString& szValue)
{
wxConfigPathChanger path(this, szKey);
wxString strKey = GetPrivateKeyName(path.Name());
szValue, m_strLocalFilename) != 0;
if ( !bOk )
- wxLogLastError("WritePrivateProfileString");
+ wxLogLastError(wxT("WritePrivateProfileString"));
return bOk;
}
-bool wxIniConfig::Write(const wxString& szKey, long lValue)
+bool wxIniConfig::DoWriteLong(const wxString& szKey, long lValue)
{
// ltoa() is not ANSI :-(
char szBuf[40]; // should be good for sizeof(long) <= 16 (128 bits)
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;
NULL, m_strLocalFilename) != 0;
if ( !bOk )
- wxLogLastError("WritePrivateProfileString");
+ wxLogLastError(wxT("WritePrivateProfileString"));
return bOk;
}
NULL, m_strLocalFilename) != 0;
if ( !bOk )
- wxLogLastError("WritePrivateProfileString");
+ wxLogLastError(wxT("WritePrivateProfileString"));
return bOk;
}
size_t nRc = GetWindowsDirectory(szBuf, WXSIZEOF(szBuf));
if ( nRc == 0 )
{
- wxLogLastError("GetWindowsDirectory");
+ wxLogLastError(wxT("GetWindowsDirectory"));
}
else if ( nRc > WXSIZEOF(szBuf) )
{
- wxFAIL_MSG("buffer is too small for Windows directory.");
+ wxFAIL_MSG(wxT("buffer is too small for Windows directory."));
}
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 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;
}
-bool wxIniConfig::RenameGroup(const wxString& oldName, const wxString& newName)
+bool wxIniConfig::RenameGroup(const wxString& WXUNUSED(oldName),
+ const wxString& WXUNUSED(newName))
{
// Not implemented
return FALSE;
}
+
+#endif
+ // wxUSE_CONFIG && wxUSE_UNICODE
projects / wxWidgets.git / blobdiff