use #if WXWIN_COMPATIBILITY_2_6 guard around implementation of wxBookCtrlSizer ctor too

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

diff --git a/src/common/config.cpp b/src/common/config.cpp
index 8be69dc19455191e2db761fbc902bb842f8839f9..62013b23e4cf72010a1ec3bd7bfb744be7d8ffe1 100644 (file)
--- a/src/common/config.cpp
+++ b/src/common/config.cpp
@@ -13,9 +13,6 @@
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "confbase.h"
-#endif
 
 #include "wx/wxprec.h"
 
@@ -36,8 +33,6 @@
 
 #include "wx/app.h"
 #include "wx/file.h"
-#include "wx/textfile.h"
-#include "wx/utils.h"
 #include "wx/utils.h"
 #include "wx/math.h"
 
@@ -228,8 +223,9 @@ bool wxConfigBase::DoWriteBool(const wxString& key, bool value)
 // ----------------------------------------------------------------------------
 
 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
@@ -246,7 +242,7 @@ wxConfigPathChanger::wxConfigPathChanger(const wxConfigBase *pContainer,
   {
     if ( m_pContainer->GetPath() != strPath )
     {
-        // do change the path
+        // we do change the path so restore it later
         m_bChanged = true;
 
         /* JACS: work around a memory bug that causes an assert
@@ -271,7 +267,6 @@ wxConfigPathChanger::wxConfigPathChanger(const wxConfigBase *pContainer,
   }
   else {
     // it's a name only, without path - nothing to do
-    m_bChanged = false;
     m_strName = strEntry;
   }
 }