#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"
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(wxT(""));
}
wxIniConfig::~wxIniConfig()
// read/write
// ----------------------------------------------------------------------------
-bool wxIniConfig::Read(const wxString& szKey, wxString *pstr) 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) ) {
- return FALSE;
- }
- else {
- *pstr = szBuf ;
- return TRUE;
- }
-}
-
-bool wxIniConfig::Read(const wxString& szKey, wxString *pstr,
- const wxString& szDefault) const
+bool wxIniConfig::DoReadString(const wxString& szKey, wxString *pstr) const
{
wxConfigPathChanger path(this, szKey);
wxString strKey = GetPrivateKeyName(path.Name());
}
if ( ::IsEmpty(szBuf) ) {
- *pstr = szDefault;
return FALSE;
}
else {
}
}
-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)
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;
// Not implemented
return FALSE;
}
+
+#endif
+ // wxUSE_CONFIG && wxUSE_UNICODE