look in codeset-specific directory for locale files first, then fallback to the one...

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

diff --git a/src/common/fileconf.cpp b/src/common/fileconf.cpp
index 2944b099951415d6c73e5ab3d4f6dee9def07dfd..c84e60de072a10df13cec44585b976d774d9dfa3 100644 (file)
--- a/src/common/fileconf.cpp
+++ b/src/common/fileconf.cpp
@@ -746,13 +746,14 @@ void wxFileConfig::SetRootPath()
   m_pCurrentGroup = m_pRootGroup;
 }
 
   m_pCurrentGroup = m_pRootGroup;
 }
 

-void wxFileConfig::SetPath(const wxString& strPath)
+bool
+wxFileConfig::DoSetPath(const wxString& strPath, bool createMissingComponents)

 {
   wxArrayString aParts;
 
   if ( strPath.empty() ) {
     SetRootPath();
 {
   wxArrayString aParts;
 
   if ( strPath.empty() ) {
     SetRootPath();

-    return;
+    return true;

   }
 
   if ( strPath[0] == wxCONFIG_PATH_SEPARATOR ) {
   }
 
   if ( strPath[0] == wxCONFIG_PATH_SEPARATOR ) {


@@ -772,7 +773,13 @@ void wxFileConfig::SetPath(const wxString& strPath)
   for ( n = 0; n < aParts.Count(); n++ ) {
     wxFileConfigGroup *pNextGroup = m_pCurrentGroup->FindSubgroup(aParts[n]);
     if ( pNextGroup == NULL )
   for ( n = 0; n < aParts.Count(); n++ ) {
     wxFileConfigGroup *pNextGroup = m_pCurrentGroup->FindSubgroup(aParts[n]);
     if ( pNextGroup == NULL )

+    {
+      if ( !createMissingComponents )
+        return false;
+

       pNextGroup = m_pCurrentGroup->AddSubgroup(aParts[n]);
       pNextGroup = m_pCurrentGroup->AddSubgroup(aParts[n]);

+    }
+

     m_pCurrentGroup = pNextGroup;
   }
 
     m_pCurrentGroup = pNextGroup;
   }
 


@@ -781,6 +788,13 @@ void wxFileConfig::SetPath(const wxString& strPath)
   for ( n = 0; n < aParts.Count(); n++ ) {
     m_strPath << wxCONFIG_PATH_SEPARATOR << aParts[n];
   }
   for ( n = 0; n < aParts.Count(); n++ ) {
     m_strPath << wxCONFIG_PATH_SEPARATOR << aParts[n];
   }

+
+  return true;
+}
+
+void wxFileConfig::SetPath(const wxString& strPath)
+{
+  DoSetPath(strPath, true /* create missing path components */);

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -857,10 +871,20 @@ size_t wxFileConfig::GetNumberOfGroups(bool bRecursive) const
 
 bool wxFileConfig::HasGroup(const wxString& strName) const
 {
 
 bool wxFileConfig::HasGroup(const wxString& strName) const
 {

-  wxConfigPathChanger path(this, strName);
+  // special case: DoSetPath("") does work as it's equivalent to DoSetPath("/")
+  // but there is no group with empty name so treat this separately
+  if ( strName.empty() )
+    return false;

 
 

-  wxFileConfigGroup *pGroup = m_pCurrentGroup->FindSubgroup(path.Name());
-  return pGroup != NULL;
+  const wxString pathOld = GetPath();
+
+  wxFileConfig *self = wx_const_cast(wxFileConfig *, this);
+  const bool
+    rc = self->DoSetPath(strName, false /* don't create missing components */);
+
+  self->SetPath(pathOld);
+
+  return rc;

 }
 
 bool wxFileConfig::HasEntry(const wxString& strName) const
 }
 
 bool wxFileConfig::HasEntry(const wxString& strName) const


@@ -1327,8 +1351,11 @@ wxFileConfigGroup::~wxFileConfigGroup()
 
 void wxFileConfigGroup::SetLine(wxFileConfigLineList *pLine)
 {
 
 void wxFileConfigGroup::SetLine(wxFileConfigLineList *pLine)
 {

-    // shouldn't be called twice unless we are resetting the line
-    wxASSERT( m_pLine == 0 || pLine == 0 );
+    // for a normal (i.e. not root) group this method shouldn't be called twice
+    // unless we are resetting the line
+    wxASSERT_MSG( !m_pParent || !m_pLine || !pLine,
+                   _T("changing line for a non-root group?") );
+

     m_pLine = pLine;
 }
 
     m_pLine = pLine;
 }