#if defined(__WXMAC__)
#include "wx/mac/private.h" // includes mac headers
+ #include "wx/filename.h" // for MacSetTypeAndCreator
#endif
#if defined(__WXMSW__)
// There's no such thing as global cfg dir in MS-DOS, let's return
// current directory (FIXME_MGL?)
return wxT(".\\");
+#elif defined(__WXWINCE__)
+ strDir = wxT("\\Windows\\");
#else // Windows
+
wxChar szWinDir[MAX_PATH];
::GetWindowsDirectory(szWinDir, MAX_PATH);
void wxFileConfig::Init()
{
m_pCurrentGroup =
- m_pRootGroup = new wxFileConfigGroup(NULL, wxT(""), this);
+ m_pRootGroup = new wxFileConfigGroup(NULL, wxEmptyString, this);
m_linesHead =
m_linesTail = NULL;
// It's not an error if (one of the) file(s) doesn't exist.
// parse the global file
- if ( !m_strGlobalFile.IsEmpty() && wxFile::Exists(m_strGlobalFile) )
+ if ( !m_strGlobalFile.empty() && wxFile::Exists(m_strGlobalFile) )
{
wxTextFile fileGlobal(m_strGlobalFile);
}
// parse the local file
- if ( !m_strLocalFile.IsEmpty() && wxFile::Exists(m_strLocalFile) )
+ if ( !m_strLocalFile.empty() && wxFile::Exists(m_strLocalFile) )
{
wxTextFile fileLocal(m_strLocalFile);
if ( fileLocal.Open(m_conv/*ignored in ANSI build*/) )
m_conv(conv)
{
// Make up names for files if empty
- if ( m_strLocalFile.IsEmpty() && (style & wxCONFIG_USE_LOCAL_FILE) )
+ if ( m_strLocalFile.empty() && (style & wxCONFIG_USE_LOCAL_FILE) )
m_strLocalFile = GetLocalFileName(GetAppName());
- if ( m_strGlobalFile.IsEmpty() && (style & wxCONFIG_USE_GLOBAL_FILE) )
+ if ( m_strGlobalFile.empty() && (style & wxCONFIG_USE_GLOBAL_FILE) )
m_strGlobalFile = GetGlobalFileName(GetAppName());
// Check if styles are not supplied, but filenames are, in which case
// add the correct styles.
- if ( !m_strLocalFile.IsEmpty() )
+ if ( !m_strLocalFile.empty() )
SetStyle(GetStyle() | wxCONFIG_USE_LOCAL_FILE);
- if ( !m_strGlobalFile.IsEmpty() )
+ if ( !m_strGlobalFile.empty() )
SetStyle(GetStyle() | wxCONFIG_USE_GLOBAL_FILE);
// if the path is not absolute, prepend the standard directory to it
// UNLESS wxCONFIG_USE_RELATIVE_PATH style is set
if ( !(style & wxCONFIG_USE_RELATIVE_PATH) )
{
- if ( !m_strLocalFile.IsEmpty() && !wxIsAbsolutePath(m_strLocalFile) )
+ if ( !m_strLocalFile.empty() && !wxIsAbsolutePath(m_strLocalFile) )
{
wxString strLocal = m_strLocalFile;
m_strLocalFile = GetLocalDir();
m_strLocalFile << strLocal;
}
- if ( !m_strGlobalFile.IsEmpty() && !wxIsAbsolutePath(m_strGlobalFile) )
+ if ( !m_strGlobalFile.empty() && !wxIsAbsolutePath(m_strGlobalFile) )
{
wxString strGlobal = m_strGlobalFile;
m_strGlobalFile = GetGlobalDir();
SetStyle(GetStyle() | wxCONFIG_USE_LOCAL_FILE);
m_pCurrentGroup =
- m_pRootGroup = new wxFileConfigGroup(NULL, wxT(""), this);
+ m_pRootGroup = new wxFileConfigGroup(NULL, wxEmptyString, this);
m_linesHead =
m_linesTail = NULL;
char buf[1024];
do
{
- inStream.Read(buf, WXSIZEOF(buf));
+ inStream.Read(buf, WXSIZEOF(buf)-1); // leave room for the NULL
const wxStreamError err = inStream.GetLastError();
break;
}
- strTmp.append(wxConvertMB2WX(buf), inStream.LastRead());
+ // FIXME: this is broken because if we have part of multibyte
+ // character in the buffer (and another part hasn't been
+ // read yet) we're going to lose data because of conversion
+ // errors
+ buf[inStream.LastRead()] = '\0';
+ strTmp += conv.cMB2WX(buf);
}
while ( !inStream.Eof() );
Parse(memText, true /* local */);
SetRootPath();
+ ResetDirty();
}
#endif // wxUSE_STREAMS
{
LineListAppend(strLine);
- // let the root group have it start line as well
+ // let the root group have its start line as well
if ( !n )
{
m_pCurrentGroup->SetLine(m_linesTail);
{
wxArrayString aParts;
- if ( strPath.IsEmpty() ) {
+ if ( strPath.empty() ) {
SetRootPath();
return;
}
szValue.c_str(),
GetPath().c_str() );
- if ( strName.IsEmpty() )
+ if ( strName.empty() )
{
// setting the value of a group is an error
- wxASSERT_MSG( wxIsEmpty(szValue), wxT("can't set value of a group!") );
+ wxASSERT_MSG( szValue.empty(), wxT("can't set value of a group!") );
// ... except if it's empty in which case it's a way to force it's creation
{
wxString line = p->Text();
line += wxTextFile::GetEOL();
- if ( !os.Write(line.mb_str(conv), line.length()) )
+
+ wxCharBuffer buf(line.mb_str(conv));
+ if ( !os.Write(buf, strlen(buf)) )
{
wxLogError(_("Error saving user configuration data."));
if ( !m_pCurrentGroup->DeleteEntry(path.Name()) )
return false;
+ SetDirty();
+
if ( bGroupIfEmptyAlso && m_pCurrentGroup->IsEmpty() ) {
if ( m_pCurrentGroup != m_pRootGroup ) {
wxFileConfigGroup *pGroup = m_pCurrentGroup;
SetPath(wxT("..")); // changes m_pCurrentGroup!
- if ( m_pCurrentGroup->DeleteSubgroupByName(pGroup->Name()) )
- SetDirty();
+ m_pCurrentGroup->DeleteSubgroupByName(pGroup->Name());
}
//else: never delete the root group
}
}
m_strLocalFile =
- m_strGlobalFile = wxT("");
+ m_strGlobalFile = wxEmptyString;
}
Init();
else
pNext->SetPrev(pPrev);
+ if ( m_pRootGroup->GetGroupLine() == pLine )
+ m_pRootGroup->SetLine(m_linesHead);
+
wxLogTrace( FILECONF_TRACE_MASK,
_T(" head: %s"),
((m_linesHead) ? m_linesHead->Text().c_str() : wxEmptyString) );
void wxFileConfigGroup::SetLine(wxFileConfigLineList *pLine)
{
- wxASSERT( m_pLine == 0 ); // shouldn't be called twice
+ // shouldn't be called twice unless we are resetting the line
+ wxASSERT( m_pLine == 0 || pLine == 0 );
m_pLine = pLine;
}
int nLine)
: m_strName(strName)
{
- wxASSERT( !strName.IsEmpty() );
+ wxASSERT( !strName.empty() );
m_pParent = pParent;
m_nLine = nLine;
}
else // this entry didn't exist in the local file
{
- // add a new line to the file
+ // add a new line to the file: note that line returned by
+ // GetLastEntryLine() may be NULL if we're in the root group and it
+ // doesn't have any entries yet, but this is ok as passing NULL
+ // line to LineListInsert() means to prepend new line to the list
wxFileConfigLineList *line = Group()->GetLastEntryLine();
m_pLine = Group()->Config()->LineListInsert(strLine, line);
wxString strResult;
strResult.Alloc(str.Len());
- bool bQuoted = !str.IsEmpty() && str[0] == '"';
+ bool bQuoted = !str.empty() && str[0] == '"';
for ( size_t n = bQuoted ? 1 : 0; n < str.Len(); n++ ) {
if ( str[n] == wxT('\\') ) {
projects / wxWidgets.git / blobdiff