Hopefully fixed library names generated by wx-config for OS/2's PM port.

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

diff --git a/src/common/fileconf.cpp b/src/common/fileconf.cpp
index daaa9291fb555161aea4d60f224f83cc6bce32e6..2944b099951415d6c73e5ab3d4f6dee9def07dfd 100644 (file)
--- a/src/common/fileconf.cpp
+++ b/src/common/fileconf.cpp
@@ -294,7 +294,7 @@ wxString wxFileConfig::GetGlobalDir()
     return wxT(".\\");
 #elif defined(__WXWINCE__)
     strDir = wxT("\\Windows\\");
     return wxT(".\\");
 #elif defined(__WXWINCE__)
     strDir = wxT("\\Windows\\");

-#elif // Windows
+#else // Windows

 
     wxChar szWinDir[MAX_PATH];
     ::GetWindowsDirectory(szWinDir, MAX_PATH);
 
     wxChar szWinDir[MAX_PATH];
     ::GetWindowsDirectory(szWinDir, MAX_PATH);


@@ -495,7 +495,7 @@ wxFileConfig::wxFileConfig(wxInputStream &inStream, wxMBConv& conv)
         char buf[1024];
         do
         {
         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();
 
 
             const wxStreamError err = inStream.GetLastError();
 


@@ -505,7 +505,12 @@ wxFileConfig::wxFileConfig(wxInputStream &inStream, wxMBConv& conv)
                 break;
             }
 
                 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() );
 
         }
         while ( !inStream.Eof() );
 


@@ -543,6 +548,7 @@ wxFileConfig::wxFileConfig(wxInputStream &inStream, wxMBConv& conv)
     Parse(memText, true /* local */);
 
     SetRootPath();
     Parse(memText, true /* local */);
 
     SetRootPath();

+    ResetDirty();

 }
 
 #endif // wxUSE_STREAMS
 }
 
 #endif // wxUSE_STREAMS


@@ -587,7 +593,7 @@ void wxFileConfig::Parse(wxTextBuffer& buffer, bool bLocal)
     {
       LineListAppend(strLine);
 
     {
       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);
       if ( !n )
       {
         m_pCurrentGroup->SetLine(m_linesTail);


@@ -1013,7 +1019,9 @@ bool wxFileConfig::Save(wxOutputStream& os, wxMBConv& conv)
     {
         wxString line = p->Text();
         line += wxTextFile::GetEOL();
     {
         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."));
 
         {
             wxLogError(_("Error saving user configuration data."));
 


@@ -1090,12 +1098,13 @@ bool wxFileConfig::DeleteEntry(const wxString& key, bool bGroupIfEmptyAlso)
   if ( !m_pCurrentGroup->DeleteEntry(path.Name()) )
     return false;
 
   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 ( 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
   }
     }
     //else: never delete the root group
   }


@@ -1256,6 +1265,9 @@ void wxFileConfig::LineListRemove(wxFileConfigLineList *pLine)
     else
         pNext->SetPrev(pPrev);
 
     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) );
     wxLogTrace( FILECONF_TRACE_MASK,
                 _T("        head: %s"),
                 ((m_linesHead) ? m_linesHead->Text().c_str() : wxEmptyString) );


@@ -1315,7 +1327,8 @@ wxFileConfigGroup::~wxFileConfigGroup()
 
 void wxFileConfigGroup::SetLine(wxFileConfigLineList *pLine)
 {
 
 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;
 }
 
     m_pLine = pLine;
 }
 


@@ -1839,20 +1852,11 @@ void wxFileConfigEntry::SetValue(const wxString& strValue, bool bUser)
         }
         else // this entry didn't exist in the local file
         {
         }
         else // this entry didn't exist in the local file
         {

-            // add a new line to the file: note the hack for the root group
-            // which is special in that it doesn't have its own group line
-            // (something like "[/]") and so the line we get for it may be not
-            // its line at all if it doesn't have any entries
-            //
-            // this is definitely not the right place to fix it but changing
-            // the root group to have NULL m_pLine will probably break too
-            // much stuff elsewhere so I don't dare to do it...
+            // 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();
             wxFileConfigLineList *line = Group()->GetLastEntryLine();

-            if ( !Group()->Parent() && line == Group()->GetGroupLine() )
-            {
-                // prepend the first root group entry to the head of the list
-                line = NULL;
-            }

             m_pLine = Group()->Config()->LineListInsert(strLine, line);
 
             Group()->SetLastEntry(this);
             m_pLine = Group()->Config()->LineListInsert(strLine, line);
 
             Group()->SetLastEntry(this);