X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f9bb777f88b5c93054e0ba0c2f1d5d9186f97a33..c7d9c476ea807927781813bca979e9f793599229:/include/wx/confbase.h diff --git a/include/wx/confbase.h b/include/wx/confbase.h index 32ecdde962..ff50f65f4b 100644 --- a/include/wx/confbase.h +++ b/include/wx/confbase.h @@ -43,8 +43,6 @@ class WXDLLIMPEXP_FWD_BASE wxArrayString; #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 @@ -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); };