a file I forgot to check in (sorry Julian)

[wxWidgets.git] / include / wx / date.h

diff --git a/include/wx/date.h b/include/wx/date.h
index 2954266d2799f24b9cd52136be1f5c5cb8b30177..fae4f9ec5084037821fd4bc280f04c6af15ab744 100644 (file)
--- a/include/wx/date.h
+++ b/include/wx/date.h
@@ -20,7 +20,16 @@
 #include "wx/object.h"
 #include "wx/string.h"
 
-#ifdef wxUSE_TIMEDATE
+#if wxUSE_TIMEDATE
+// These lines necessary to stop VC++ 6 being confused about namespaces
+class WXDLLEXPORT wxDate;
+bool WXDLLEXPORT operator<(const wxDate &dt1, const wxDate &dt2);
+bool WXDLLEXPORT operator<(const wxDate &dt1, const wxDate &dt2);
+bool WXDLLEXPORT operator <= (const wxDate &dt1, const wxDate &dt2);
+bool WXDLLEXPORT operator >  (const wxDate &dt1, const wxDate &dt2);
+bool WXDLLEXPORT operator >= (const wxDate &dt1, const wxDate &dt2);
+bool WXDLLEXPORT operator == (const wxDate &dt1, const wxDate &dt2);
+bool WXDLLEXPORT operator != (const wxDate &dt1, const wxDate &dt2);
 
 enum wxdate_format_type {wxMDY, wxDAY, wxMONTH, wxFULL, wxEUROPEAN};
 
@@ -52,7 +61,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 +91,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);