// Name: src/msw/iniconf.cpp
// Purpose: implementation of wxIniConfig class
// Author: Vadim Zeitlin
-// Modified by:
+// Modified by:
// Created: 27.07.98
// RCS-ID: $Id$
// Copyright: (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
#endif
#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/string.h"
+ #include "wx/intl.h"
+ #include "wx/event.h"
+ #include "wx/app.h"
+ #include "wx/utils.h"
#endif //WX_PRECOMP
-#include <wx/dynarray.h>
-#include <wx/log.h>
-#include <wx/config.h>
+// Doesn't yet compile in Unicode mode
-#include <wx/msw/iniconf.h>
+#if wxUSE_CONFIG && !wxUSE_UNICODE
+
+#include "wx/dynarray.h"
+#include "wx/log.h"
+#include "wx/config.h"
+
+#include "wx/msw/iniconf.h"
// _WINDOWS_ is defined when windows.h is included,
// __WXMSW__ is defined for MS Windows compilation
// ctor & dtor
// ----------------------------------------------------------------------------
-wxIniConfig::wxIniConfig(const wxString& strAppName, const wxString& strVendor,
- const wxString& localFilename, const wxString& globalFilename, long style):
- wxConfigBase(strAppName, strVendor, localFilename, globalFilename, style)
+wxIniConfig::wxIniConfig(const wxString& strAppName,
+ const wxString& strVendor,
+ const wxString& localFilename,
+ const wxString& globalFilename,
+ long style)
+ : 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.IsEmpty() ? (wxTheApp ? wxTheApp->GetVendorName()
+ : strAppName)
+ : strVendor,
+ localFilename, globalFilename, style)
+#endif
{
- if ( GetAppName().IsEmpty() )
- {
- wxString app;
- if (wxTheApp)
- app = wxTheApp->GetAppName();
- wxASSERT( !app.IsEmpty() );
- SetAppName(app);
- }
-
- // Vendor name is required in wxIniConfig.
- // TODO: should it be required? Why isn't appName used instead? -- JACS
- if ( GetVendorName().IsEmpty() )
- {
- wxString vendor;
- if (wxTheApp)
- vendor = wxTheApp->GetVendorName();
- else
- vendor = strAppName;
- SetVendorName(vendor);
- }
+ 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(wxT(""));
}
wxIniConfig::~wxIniConfig()
// always return abs path
s_str = wxCONFIG_PATH_SEPARATOR;
- if ( m_strGroup == (const char*) PATH_SEP_REPLACE ) {
+ if ( m_strGroup == wxString(PATH_SEP_REPLACE) ) {
// we're at the root level, nothing to do
}
else {
return FALSE;
}
else {
+ *pstr = szBuf ;
return TRUE;
}
}
return FALSE;
}
else {
+ *pstr = szBuf ;
return TRUE;
}
}
// is it really nMagic?
lVal = GetPrivateProfileInt(m_strGroup, strKey, nMagic2, m_strLocalFilename);
- if ( lVal == nMagic ) {
+ if ( lVal != nMagic2 ) {
// the nMagic it returned was indeed read from the file
*pl = lVal;
return TRUE;
}
+ // CS : I have no idea why they should look up in win.ini
+ // and if at all they have to do the same procedure using the two magic numbers
+ // otherwise it always returns true, even if the key was not there at all
+#if 0
// no, it was just returning the default value, so now look in win.ini
- *pl = GetProfileInt(GetVendorName(), GetKeyName(szKey), *pl);
+ *pl = GetProfileInt(GetVendorName(), GetKeyName(szKey), *pl);
return TRUE;
+#endif
+ return FALSE ;
}
bool wxIniConfig::Write(const wxString& szKey, const wxString& szValue)
szValue, 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;
}
{
wxConfigPathChanger path(this, szKey);
- // passing NULL as section name to WritePrivateProfileString deletes the
+ // 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;
if ( !bOk )
- wxLogLastError("WritePrivateProfileString");
+ wxLogLastError(wxT("WritePrivateProfileString"));
return bOk;
}
char szBuf[MAX_PATH];
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;
return TRUE;
}
+
+bool wxIniConfig::RenameEntry(const wxString& oldName, const wxString& newName)
+{
+ // Not implemented
+ return FALSE;
+}
+
+bool wxIniConfig::RenameGroup(const wxString& oldName, const wxString& newName)
+{
+ // Not implemented
+ return FALSE;
+}
+
+#endif
+ // wxUSE_CONFIG && wxUSE_UNICODE
projects / wxWidgets.git / blobdiff