don't return wxLIST_HITTEST_ONITEMICON from HitTest() when the muse is clicked to...

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

diff --git a/src/common/config.cpp b/src/common/config.cpp
index 2e8372db9366eb0ae3cbfdee29a6ae899d9e60ff..c75528c66e74f109f6bea39bec423f18559a7a0a 100644 (file)
--- a/src/common/config.cpp
+++ b/src/common/config.cpp
@@ -75,6 +75,7 @@ wxConfigBase::wxConfigBase(const wxString& appName,
 
 wxConfigBase::~wxConfigBase()
 {
+    // required here for Darwin
 }
 
 wxConfigBase *wxConfigBase::Set(wxConfigBase *pConfig)
@@ -239,7 +240,7 @@ wxConfigPathChanger::wxConfigPathChanger(const wxConfigBase *pContainer,
     strPath = wxCONFIG_PATH_SEPARATOR;
   }
 
-  if ( !strPath.IsEmpty() ) {
+  if ( !strPath.IsEmpty() && m_pContainer->GetPath() != strPath ) {
     // do change the path
     m_bChanged = true;
     m_strName = strEntry.AfterLast(wxCONFIG_PATH_SEPARATOR);
@@ -352,7 +353,7 @@ wxString wxExpandEnvVars(const wxString& str)
 
           // 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