X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f9bb777f88b5c93054e0ba0c2f1d5d9186f97a33..125e7c11c16f23daa4c594f3b8d90194099c2394:/include/wx/confbase.h

diff --git a/include/wx/confbase.h b/include/wx/confbase.h
index 32ecdde962..e0ed69ff5e 100644
--- a/include/wx/confbase.h
+++ b/include/wx/confbase.h
@@ -32,19 +32,17 @@ class WXDLLIMPEXP_FWD_BASE wxArrayString;
 
 /// separates group and entry names (probably shouldn't be changed)
 #ifndef wxCONFIG_PATH_SEPARATOR
-  #define   wxCONFIG_PATH_SEPARATOR     _T('/')
+  #define   wxCONFIG_PATH_SEPARATOR     wxT('/')
 #endif
 
 /// introduces immutable entries
 // (i.e. the ones which can't be changed from the local config file)
 #ifndef wxCONFIG_IMMUTABLE_PREFIX
-  #define   wxCONFIG_IMMUTABLE_PREFIX   _T('!')
+  #define   wxCONFIG_IMMUTABLE_PREFIX   wxT('!')
 #endif
 
 #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))
@@ -56,6 +54,7 @@ class WXDLLIMPEXP_FWD_BASE wxArrayString;
 // 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
@@ -218,7 +217,7 @@ public:
   }
 #endif // wxHAS_CONFIG_TEMPLATE_RW
 
-  // convenience functions returning directly the value 
+  // convenience functions returning directly the value
   wxString Read(const wxString& key,
                 const wxString& defVal = wxEmptyString) const
     { wxString s; (void)Read(key, &s, defVal); return s; }
@@ -437,7 +436,7 @@ private:
                 m_strOldPath;   // saved path
   bool          m_bChanged;     // was the path changed?
 
-  DECLARE_NO_COPY_CLASS(wxConfigPathChanger)
+  wxDECLARE_NO_COPY_CLASS(wxConfigPathChanger);
 };