X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/04af2f5ce39da0adc94f0786a26c80fd1ea8a685..df18cc7aa1afdbe74d4b8e398d12ef34d1e78b5c:/include/wx/confbase.h diff --git a/include/wx/confbase.h b/include/wx/confbase.h index d764bbbd48..bccafa801e 100644 --- a/include/wx/confbase.h +++ b/include/wx/confbase.h @@ -11,11 +11,12 @@ // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// -#ifndef _WX_CONFBASE_H_ -#define _WX_CONFBASE_H_ +#ifndef _WX_CONFBASE_H_ +#define _WX_CONFBASE_H_ #include "wx/defs.h" #include "wx/string.h" +#include "wx/object.h" class WXDLLIMPEXP_BASE wxArrayString; @@ -72,7 +73,7 @@ enum // (long) type (TODO doubles and other types such as wxDate coming soon). // ---------------------------------------------------------------------------- -class WXDLLIMPEXP_BASE wxConfigBase +class WXDLLIMPEXP_BASE wxConfigBase : public wxObject { public: // constants @@ -203,8 +204,12 @@ public: // we have to provide a separate version for C strings as otherwise they // would be converted to bool and not to wxString as expected! - bool Write(const wxString& key, const wxChar *value) + bool Write(const wxString& key, const char *value) { return Write(key, wxString(value)); } +#if wxUSE_WCHAR_T + bool Write(const wxString& key, const wchar_t *value) + { return Write(key, wxString(value)); } +#endif // permanently writes all changes virtual bool Flush(bool bCurrentOnly = false) = 0; @@ -291,6 +296,8 @@ private: // Style flag long m_style; + + DECLARE_ABSTRACT_CLASS(wxConfigBase) }; // a handy little class which changes current path to the path of given entry @@ -353,7 +360,5 @@ WXDLLIMPEXP_BASE wxString wxExpandEnvVars(const wxString &sz); */ WXDLLIMPEXP_BASE void wxSplitPath(wxArrayString& aParts, const wxChar *sz); - -#endif - // _WX_CONFIG_H_ +#endif // _WX_CONFBASE_H_