X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e8b6d59d515f93852b4a793a9893f36df6a957e2..63cc5d9d20f997961881855811f6b6987679969d:/include/wx/time.h diff --git a/include/wx/time.h b/include/wx/time.h index ec06d912bb..35cce7f686 100644 --- a/include/wx/time.h +++ b/include/wx/time.h @@ -55,8 +55,11 @@ public: wxTime(const wxDate&, hourTy h =0, minuteTy m =0, secondTy s=0, bool dst =FALSE); // Convert to string - operator char * (void); +#ifndef __SALFORDC__ + operator wxChar * (void); operator wxDate() const; +#endif + bool operator<(const wxTime& t) const { return sec < t.sec; } bool operator<=(const wxTime& t) const { return sec <= t.sec; } bool operator>(const wxTime& t) const { return sec > t.sec; } @@ -91,7 +94,7 @@ public: wxTime Min(const wxTime&) const; static void SetFormat(const tFormat lFormat = wx12h, const tPrecision lPrecision = wxStdMinSec); - char *FormatTime() const; + wxChar *FormatTime() const; /* virtual int compare(const Object&) const; virtual void deepenShallowCopy(); // {}