X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d851f77ec18370a5f664ef2fbe46ad00665f7370..b11708106f93d28dbb47218b18e02674ad6c0cdb:/include/wx/date.h

diff --git a/include/wx/date.h b/include/wx/date.h
index 2954266d27..49936f064d 100644
--- a/include/wx/date.h
+++ b/include/wx/date.h
@@ -20,7 +20,7 @@
 #include "wx/object.h"
 #include "wx/string.h"
 
-#ifdef wxUSE_TIMEDATE
+#if wxUSE_TIMEDATE
 
 enum wxdate_format_type {wxMDY, wxDAY, wxMONTH, wxFULL, wxEUROPEAN};
 
@@ -52,7 +52,10 @@ class WXDLLEXPORT wxDate: public wxObject
   wxDate (const wxString& dat);
   wxDate (const wxDate &dt);
 
+#ifndef __SALFORDC__
   operator wxString  (void);
+#endif
+
   void operator =   (const wxDate& date);
   void operator =   (const wxString& date);
 
@@ -79,7 +82,7 @@ class WXDLLEXPORT wxDate: public wxObject
   friend bool WXDLLEXPORT operator == (const wxDate &dt1, const wxDate &dt2);
   friend bool WXDLLEXPORT operator != (const wxDate &dt1, const wxDate &dt2);
 
-  friend ostream& WXDLLEXPORT operator << (ostream &os, const wxDate &dt);
+  friend ostream WXDLLEXPORT & operator << (ostream &os, const wxDate &dt);
 
   wxString FormatDate 	   (int type=-1) const;
   void  SetFormat (int format);