no changes, just remove #if'd out code

[wxWidgets.git] / include / wx / confbase.h

diff --git a/include/wx/confbase.h b/include/wx/confbase.h
index 32ecdde96203f37768849f38e1074e873f96fcfa..ff50f65f4bc5b899eea6854d897bd05cd50aedef 100644 (file)
--- a/include/wx/confbase.h
+++ b/include/wx/confbase.h
@@ -43,8 +43,6 @@ class WXDLLIMPEXP_FWD_BASE wxArrayString;
 
 #if wxUSE_CONFIG
 
 
 #if wxUSE_CONFIG
 

-#include "wx/string.h"
-

 /// should we use registry instead of configuration files under Windows?
 // (i.e. whether wxConfigBase::Create() will create a wxFileConfig (if it's
 //  false) or wxRegConfig (if it's true and we're under Win32))
 /// should we use registry instead of configuration files under Windows?
 // (i.e. whether wxConfigBase::Create() will create a wxFileConfig (if it's
 //  false) or wxRegConfig (if it's true and we're under Win32))


@@ -56,6 +54,7 @@ class WXDLLIMPEXP_FWD_BASE wxArrayString;
 // symbol if the template functions are available
 #if (!defined(__VISUALC__) || __VISUALC__ > 1200) && \
     !defined( __VMS ) && \
 // symbol if the template functions are available
 #if (!defined(__VISUALC__) || __VISUALC__ > 1200) && \
     !defined( __VMS ) && \

+    !(defined(__HP_aCC) && defined(__hppa)) && \

     !defined (__DMC__)
     #define wxHAS_CONFIG_TEMPLATE_RW
 #endif
     !defined (__DMC__)
     #define wxHAS_CONFIG_TEMPLATE_RW
 #endif


@@ -437,7 +436,7 @@ private:
                 m_strOldPath;   // saved path
   bool          m_bChanged;     // was the path changed?
 
                 m_strOldPath;   // saved path
   bool          m_bChanged;     // was the path changed?
 

-  DECLARE_NO_COPY_CLASS(wxConfigPathChanger)
+  wxDECLARE_NO_COPY_CLASS(wxConfigPathChanger);

 };
 
 
 };