Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

replaced wxEmptyString with "" because it's defined in gdicmn.h (sic!) which,

Browse Source 
of course, is not always included before confbase.h...


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@652 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1998-09-03 12:03:22 +00:00
parent 9a648dc916
commit e96ddf25ad
2 changed files with 7 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/wx/confbase.h
View File

@@ -112,9 +112,9 @@ public:
// Not all args will always be used by derived classes, but // Not all args will always be used by derived classes, but
// including them all in each class ensures compatibility. // including them all in each class ensures compatibility.
// If appName is empty, uses wxApp name // If appName is empty, uses wxApp name
wxConfigBase(const wxString& appName = wxEmptyString, const wxString& vendorName = wxEmptyString, wxConfigBase(const wxString& appName = "", const wxString& vendorName = "",
const wxString& localFilename = wxEmptyString, const wxString& globalFilename = wxEmptyString, const wxString& localFilename = "", const wxString& globalFilename = "",
long style = 0); long style = 0);
// empty but ensures that dtor of all derived classes is virtual // empty but ensures that dtor of all derived classes is virtual
virtual ~wxConfigBase() { } virtual ~wxConfigBase() { }
@@ -155,7 +155,7 @@ public:
virtual bool Read(const wxString& key, wxString *pStr) const = 0; virtual bool Read(const wxString& key, wxString *pStr) const = 0;
virtual bool Read(const wxString& key, wxString *pStr, const wxString& defVal) const; 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 = "") const;
virtual bool Read(const wxString& key, long *pl) const = 0; virtual bool Read(const wxString& key, long *pl) const = 0;
virtual bool Read(const wxString& key, long *pl, long defVal) const; virtual bool Read(const wxString& key, long *pl, long defVal) const;

18
include/wx/fileconf.h
View File

@@ -133,9 +133,9 @@ public:
// New constructor: one size fits all. Specify wxCONFIG_USE_LOCAL_FILE // New constructor: one size fits all. Specify wxCONFIG_USE_LOCAL_FILE
// or wxCONFIG_USE_GLOBAL_FILE to say which files should be used. // or wxCONFIG_USE_GLOBAL_FILE to say which files should be used.
wxFileConfig(const wxString& appName, const wxString& vendorName = wxEmptyString, wxFileConfig(const wxString& appName, const wxString& vendorName = "",
const wxString& localFilename = wxEmptyString, const wxString& globalFilename = wxEmptyString, const wxString& localFilename = "", const wxString& globalFilename = "",
long style = wxCONFIG_USE_LOCAL_FILE); long style = wxCONFIG_USE_LOCAL_FILE);
// dtor will save unsaved data // dtor will save unsaved data
virtual ~wxFileConfig(); virtual ~wxFileConfig();
@@ -155,18 +155,6 @@ public:
virtual bool HasGroup(const wxString& strName) const; virtual bool HasGroup(const wxString& strName) const;
virtual bool HasEntry(const wxString& strName) const; virtual bool HasEntry(const wxString& strName) const;
#if 0
virtual bool Read(wxString *pstr, const char *szKey,
const char *szDefault = 0) const;
virtual const char *Read(const char *szKey,
const char *szDefault = 0) const;
virtual bool Read(long *pl, const char *szKey, long lDefault) const;
virtual long Read(const char *szKey, long lDefault) const
{ return wxConfigBase::Read(szKey, lDefault); }
virtual bool Write(const char *szKey, const char *szValue);
virtual bool Write(const char *szKey, long lValue);
#endif
virtual bool Read(const wxString& key, wxString *pStr) const; virtual bool Read(const wxString& key, wxString *pStr) const;
virtual bool Read(const wxString& key, wxString *pStr, const wxString& defValue) const; virtual bool Read(const wxString& key, wxString *pStr, const wxString& defValue) const;
virtual bool Read(const wxString& key, long *pl) const; virtual bool Read(const wxString& key, long *pl) const;