added closing parenthesis inside comment, no real changes

[wxWidgets.git] / src / common / fileconf.cpp

diff --git a/src/common/fileconf.cpp b/src/common/fileconf.cpp
index a4c5629b0b94e66ad140ec2242e7ac778eee6fe6..7e0291e96839b59940649a06c43a5b10d88ba8b9 100644 (file)
--- a/src/common/fileconf.cpp
+++ b/src/common/fileconf.cpp
@@ -292,7 +292,10 @@ wxString wxFileConfig::GetGlobalDir()
     // 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);
 
@@ -540,6 +543,7 @@ wxFileConfig::wxFileConfig(wxInputStream &inStream, wxMBConv& conv)
     Parse(memText, true /* local */);
 
     SetRootPath();
+    ResetDirty();
 }
 
 #endif // wxUSE_STREAMS
@@ -584,7 +588,7 @@ void wxFileConfig::Parse(wxTextBuffer& buffer, bool bLocal)
     {
       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);
@@ -1253,6 +1257,9 @@ void wxFileConfig::LineListRemove(wxFileConfigLineList *pLine)
     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) );
@@ -1312,7 +1319,8 @@ wxFileConfigGroup::~wxFileConfigGroup()
 
 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;
 }