Don't delete model in views destructor as several

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

diff --git a/src/common/config.cpp b/src/common/config.cpp
index 2e8372db9366eb0ae3cbfdee29a6ae899d9e60ff..8e5572cf3947bdaa07eebfd6f1ab845d0341c5af 100644 (file)
--- a/src/common/config.cpp
+++ b/src/common/config.cpp
@@ -13,9 +13,6 @@
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "confbase.h"
-#endif

 
 #include "wx/wxprec.h"
 
 
 #include "wx/wxprec.h"
 


@@ -39,9 +36,9 @@
 #include "wx/textfile.h"
 #include "wx/utils.h"
 #include "wx/utils.h"
 #include "wx/textfile.h"
 #include "wx/utils.h"
 #include "wx/utils.h"

+#include "wx/math.h"

 
 #include <stdlib.h>
 
 #include <stdlib.h>

-#include <math.h>

 #include <ctype.h>
 #include <limits.h>     // for INT_MAX
 
 #include <ctype.h>
 #include <limits.h>     // for INT_MAX
 


@@ -75,6 +72,7 @@ wxConfigBase::wxConfigBase(const wxString& appName,
 
 wxConfigBase::~wxConfigBase()
 {
 
 wxConfigBase::~wxConfigBase()
 {

+    // required here for Darwin

 }
 
 wxConfigBase *wxConfigBase::Set(wxConfigBase *pConfig)
 }
 
 wxConfigBase *wxConfigBase::Set(wxConfigBase *pConfig)


@@ -90,6 +88,8 @@ wxConfigBase *wxConfigBase::Create()
     ms_pConfig =
     #if defined(__WXMSW__) && wxUSE_CONFIG_NATIVE
         new wxRegConfig(wxTheApp->GetAppName(), wxTheApp->GetVendorName());
     ms_pConfig =
     #if defined(__WXMSW__) && wxUSE_CONFIG_NATIVE
         new wxRegConfig(wxTheApp->GetAppName(), wxTheApp->GetVendorName());

+    #elif defined(__WXPALMOS__) && wxUSE_CONFIG_NATIVE
+        new wxPrefConfig(wxTheApp->GetAppName());

     #else // either we're under Unix or wish to use files even under Windows
       new wxFileConfig(wxTheApp->GetAppName());
     #endif
     #else // either we're under Unix or wish to use files even under Windows
       new wxFileConfig(wxTheApp->GetAppName());
     #endif


@@ -225,33 +225,50 @@ bool wxConfigBase::DoWriteBool(const wxString& key, bool value)
 // ----------------------------------------------------------------------------
 
 wxConfigPathChanger::wxConfigPathChanger(const wxConfigBase *pContainer,
 // ----------------------------------------------------------------------------
 
 wxConfigPathChanger::wxConfigPathChanger(const wxConfigBase *pContainer,

-                                 const wxString& strEntry)
+                                         const wxString& strEntry)

 {
 {

+  m_bChanged = false;

   m_pContainer = (wxConfigBase *)pContainer;
 
   // the path is everything which precedes the last slash
   wxString strPath = strEntry.BeforeLast(wxCONFIG_PATH_SEPARATOR);
 
   // except in the special case of "/keyname" when there is nothing before "/"
   m_pContainer = (wxConfigBase *)pContainer;
 
   // the path is everything which precedes the last slash
   wxString strPath = strEntry.BeforeLast(wxCONFIG_PATH_SEPARATOR);
 
   // except in the special case of "/keyname" when there is nothing before "/"

-  if ( strPath.IsEmpty() &&
-       ((!strEntry.IsEmpty()) && strEntry[0] == wxCONFIG_PATH_SEPARATOR) )
+  if ( strPath.empty() &&
+       ((!strEntry.empty()) && strEntry[0] == wxCONFIG_PATH_SEPARATOR) )

   {
     strPath = wxCONFIG_PATH_SEPARATOR;
   }
 
   {
     strPath = wxCONFIG_PATH_SEPARATOR;
   }
 

-  if ( !strPath.IsEmpty() ) {
-    // do change the path
-    m_bChanged = true;
+  if ( !strPath.empty() )
+  {
+    if ( m_pContainer->GetPath() != strPath )
+    {
+        // we do change the path so restore it later
+        m_bChanged = true;
+
+        /* JACS: work around a memory bug that causes an assert
+           when using wxRegConfig, related to reference-counting.
+           Can be reproduced by removing (const wxChar*) below and
+           adding the following code to the config sample OnInit under
+           Windows:
+
+           pConfig->SetPath(wxT("MySettings"));
+           pConfig->SetPath(wxT(".."));
+           int value;
+           pConfig->Read(_T("MainWindowX"), & value);
+        */
+        m_strOldPath = (const wxChar*) m_pContainer->GetPath();
+        if ( *m_strOldPath.c_str() != wxCONFIG_PATH_SEPARATOR )
+          m_strOldPath += wxCONFIG_PATH_SEPARATOR;
+        m_pContainer->SetPath(strPath);
+    }
+
+    // in any case, use the just the name, not full path

     m_strName = strEntry.AfterLast(wxCONFIG_PATH_SEPARATOR);
     m_strName = strEntry.AfterLast(wxCONFIG_PATH_SEPARATOR);

-    m_strOldPath = m_pContainer->GetPath();
-    if ( m_strOldPath.Len() == 0 ||
-         m_strOldPath.Last() != wxCONFIG_PATH_SEPARATOR )
-        m_strOldPath += wxCONFIG_PATH_SEPARATOR;
-    m_pContainer->SetPath(strPath);

   }
   else {
     // it's a name only, without path - nothing to do
   }
   else {
     // it's a name only, without path - nothing to do

-    m_bChanged = false;

     m_strName = strEntry;
   }
 }
     m_strName = strEntry;
   }
 }


@@ -273,24 +290,25 @@ wxConfigPathChanger::~wxConfigPathChanger()
 // understands both Unix and Windows (but only under Windows) environment
 // variables expansion: i.e. $var, $(var) and ${var} are always understood
 // and in addition under Windows %var% is also.
 // understands both Unix and Windows (but only under Windows) environment
 // variables expansion: i.e. $var, $(var) and ${var} are always understood
 // and in addition under Windows %var% is also.

+
+// don't change the values the enum elements: they must be equal
+// to the matching [closing] delimiter.
+enum Bracket
+{
+  Bracket_None,
+  Bracket_Normal  = ')',
+  Bracket_Curly   = '}',
+#ifdef  __WXMSW__
+  Bracket_Windows = '%',    // yeah, Windows people are a bit strange ;-)
+#endif
+  Bracket_Max
+};
+

 wxString wxExpandEnvVars(const wxString& str)
 {
   wxString strResult;
   strResult.Alloc(str.Len());
 
 wxString wxExpandEnvVars(const wxString& str)
 {
   wxString strResult;
   strResult.Alloc(str.Len());
 

-  // don't change the values the enum elements: they must be equal
-  // to the matching [closing] delimiter.
-  enum Bracket
-  {
-    Bracket_None,
-    Bracket_Normal  = ')',
-    Bracket_Curly   = '}',
-#ifdef  __WXMSW__
-    Bracket_Windows = '%',    // yeah, Windows people are a bit strange ;-)
-#endif
-    Bracket_Max
-  };
-

   size_t m;
   for ( size_t n = 0; n < str.Len(); n++ ) {
     switch ( str[n] ) {
   size_t m;
   for ( size_t n = 0; n < str.Len(); n++ ) {
     switch ( str[n] ) {


@@ -352,7 +370,7 @@ wxString wxExpandEnvVars(const wxString& str)
 
           // check the closing bracket
           if ( bracket != Bracket_None ) {
 
           // check the closing bracket
           if ( bracket != Bracket_None ) {

-            if ( m == str.Len() || str[m] != (char)bracket ) {
+            if ( m == str.Len() || str[m] != (wxChar)bracket ) {

               // under MSW it's common to have '%' characters in the registry
               // and it's annoying to have warnings about them each time, so
               // ignroe them silently if they are not used for env vars
               // under MSW it's common to have '%' characters in the registry
               // and it's annoying to have warnings about them each time, so
               // ignroe them silently if they are not used for env vars


@@ -360,8 +378,8 @@ wxString wxExpandEnvVars(const wxString& str)
               // under Unix, OTOH, this warning could be useful for the user to
               // understand why isn't the variable expanded as intended
               #ifndef __WXMSW__
               // under Unix, OTOH, this warning could be useful for the user to
               // understand why isn't the variable expanded as intended
               #ifndef __WXMSW__

-                wxLogWarning(_("Environment variables expansion failed: missing '%c' at position %d in '%s'."),
-                             (char)bracket, m + 1, str.c_str());
+                wxLogWarning(_("Environment variables expansion failed: missing '%c' at position %u in '%s'."),
+                             (char)bracket, (unsigned int) (m + 1), str.c_str());

               #endif // __WXMSW__
             }
             else {
               #endif // __WXMSW__
             }
             else {


@@ -378,7 +396,8 @@ wxString wxExpandEnvVars(const wxString& str)
 
       case '\\':
         // backslash can be used to suppress special meaning of % and $
 
       case '\\':
         // backslash can be used to suppress special meaning of % and $

-        if ( n != str.Len() && (str[n + 1] == wxT('%') || str[n + 1] == wxT('$')) ) {
+        if ( n != str.Len() - 1 &&
+                (str[n + 1] == wxT('%') || str[n + 1] == wxT('$')) ) {

           strResult += str[++n];
 
           break;
           strResult += str[++n];
 
           break;


@@ -414,7 +433,7 @@ void wxSplitPath(wxArrayString& aParts, const wxChar *sz)
 
         strCurrent.Empty();
       }
 
         strCurrent.Empty();
       }

-      else if ( !strCurrent.IsEmpty() ) {
+      else if ( !strCurrent.empty() ) {

         aParts.push_back(strCurrent);
         strCurrent.Empty();
       }
         aParts.push_back(strCurrent);
         strCurrent.Empty();
       }