X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5d1902d6d6efc842c8f488520d3cca40f1ae99f8..858f7d664166563a7725f3487249eed7f30e2f31:/include/wx/confbase.h diff --git a/include/wx/confbase.h b/include/wx/confbase.h index b2a4ceb21f..edbe8ca2ca 100644 --- a/include/wx/confbase.h +++ b/include/wx/confbase.h @@ -20,7 +20,7 @@ #include "wx/defs.h" -#ifdef wxUSE_CONFIG +#if wxUSE_CONFIG #include "wx/string.h" @@ -109,8 +109,8 @@ public: // Not all args will always be used by derived classes, but // including them all in each class ensures compatibility. // If appName is empty, uses wxApp name - wxConfigBase(const wxString& appName = "", const wxString& vendorName = "", - const wxString& localFilename = "", const wxString& globalFilename = "", + wxConfigBase(const wxString& appName = wxEmptyString, const wxString& vendorName = wxEmptyString, + const wxString& localFilename = wxEmptyString, const wxString& globalFilename = wxEmptyString, long style = 0); // empty but ensures that dtor of all derived classes is virtual @@ -152,7 +152,7 @@ public: virtual bool Read(const wxString& key, wxString *pStr) const = 0; virtual bool Read(const wxString& key, wxString *pStr, const wxString& defVal) const; - virtual wxString Read(const wxString& key, const wxString& defVal = "") const; + virtual wxString Read(const wxString& key, const wxString& defVal = wxEmptyString) const; virtual bool Read(const wxString& key, long *pl) const = 0; virtual bool Read(const wxString& key, long *pl, long defVal) const;