#pragma hdrstop
#endif
-// Doesn't yet compile in Unicode mode
-
-#if wxUSE_CONFIG && !wxUSE_UNICODE
+#if wxUSE_INICONF
#ifndef WX_PRECOMP
- #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"
+ #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
#include "wx/config.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 "wx/msw/wrapwin.h"
-#endif //windows.h
-
// ----------------------------------------------------------------------------
// constants
// ----------------------------------------------------------------------------
// ----------------------------------------------------------------------------
// ctor & dtor
// ----------------------------------------------------------------------------
+IMPLEMENT_ABSTRACT_CLASS(wxIniConfig, wxConfigBase)
wxIniConfig::wxIniConfig(const wxString& strAppName,
const wxString& strVendor,
s_str << m_strGroup;
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);
}
}
// 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) )
+ GetPrivateProfileString(m_strGroup.wx_str(), NULL, wxT(""),
+ szBuf, WXSIZEOF(szBuf),
+ m_strLocalFilename.wx_str());
+ if ( !wxIsEmpty(szBuf) )
return false;
- GetProfileString(m_strGroup, NULL, "", szBuf, WXSIZEOF(szBuf));
- if ( !::IsEmpty(szBuf) )
+ GetProfileString(m_strGroup.wx_str(), NULL, wxT(""), szBuf, WXSIZEOF(szBuf));
+ if ( !wxIsEmpty(szBuf) )
return false;
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.wx_str(), strKey.wx_str(), wxT(""),
+ szBuf, WXSIZEOF(szBuf),
+ m_strLocalFilename.wx_str());
+ if ( wxIsEmpty(szBuf) ) {
// now look in win.ini
wxString strKey = GetKeyName(path.Name());
- GetProfileString(m_strGroup, strKey, "", szBuf, WXSIZEOF(szBuf));
+ GetProfileString(m_strGroup.wx_str(), strKey.wx_str(),
+ wxT(""), szBuf, WXSIZEOF(szBuf));
}
- if ( ::IsEmpty(szBuf) )
+ if ( wxIsEmpty(szBuf) )
return false;
*pstr = szBuf;
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.wx_str(), strKey.wx_str(),
+ nMagic, m_strLocalFilename.wx_str());
if ( lVal != nMagic ) {
// the value was read from the file
*pl = lVal;
}
// is it really nMagic?
- lVal = GetPrivateProfileInt(m_strGroup, strKey, nMagic2, m_strLocalFilename);
+ lVal = GetPrivateProfileInt(m_strGroup.wx_str(), strKey.wx_str(),
+ nMagic2, m_strLocalFilename.wx_str());
if ( lVal != nMagic2 ) {
// the nMagic it returned was indeed read from the file
*pl = lVal;
wxConfigPathChanger path(this, szKey);
wxString strKey = GetPrivateKeyName(path.Name());
- bool bOk = WritePrivateProfileString(m_strGroup, strKey,
- szValue, m_strLocalFilename) != 0;
+ bool bOk = WritePrivateProfileString(m_strGroup.wx_str(), strKey.wx_str(),
+ szValue.wx_str(),
+ m_strLocalFilename.wx_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.wx_str()) != 0;
}
// ----------------------------------------------------------------------------
wxConfigPathChanger path(this, szKey);
wxString strKey = GetPrivateKeyName(path.Name());
- if (WritePrivateProfileString(m_strGroup, strKey,
- (const char*) NULL, m_strLocalFilename) == 0)
+ if (WritePrivateProfileString(m_strGroup.wx_str(), strKey.wx_str(),
+ NULL, m_strLocalFilename.wx_str()) == 0)
return false;
if ( !bGroupIfEmptyAlso || !IsEmpty() )
return true;
// delete the current group too
- bool bOk = WritePrivateProfileString(m_strGroup, NULL,
- NULL, m_strLocalFilename) != 0;
+ bool bOk = WritePrivateProfileString(m_strGroup.wx_str(), NULL,
+ NULL, m_strLocalFilename.wx_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().wx_str(), NULL,
+ NULL, m_strLocalFilename.wx_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().wx_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 )
{
return false;
}
-#endif
- // wxUSE_CONFIG && wxUSE_UNICODE
+#endif // wxUSE_INICONF
projects / wxWidgets.git / blobdiff