X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/47d67540a017101b3e46abe9ef0f55914d8de37e..1bfcb0b6c3728b9e3e970c8569cf6405df9ff4f9:/include/wx/date.h

diff --git a/include/wx/date.h b/include/wx/date.h
index 48eb2ce8a4..fae4f9ec50 100644
--- a/include/wx/date.h
+++ b/include/wx/date.h
@@ -21,6 +21,15 @@
 #include "wx/string.h"
 
 #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);
 
@@ -72,14 +84,14 @@ class WXDLLEXPORT wxDate: public wxObject
   wxDate &operator -- ();     // Prefix decrement
   wxDate &operator -- (int);  // Postfix decrement
 
-  friend bool operator <  (const wxDate &dt1, const wxDate &dt2);
-  friend bool operator <= (const wxDate &dt1, const wxDate &dt2);
-  friend bool operator >  (const wxDate &dt1, const wxDate &dt2);
-  friend bool operator >= (const wxDate &dt1, const wxDate &dt2);
-  friend bool operator == (const wxDate &dt1, const wxDate &dt2);
-  friend bool operator != (const wxDate &dt1, const wxDate &dt2);
+  friend bool WXDLLEXPORT operator <  (const wxDate &dt1, const wxDate &dt2);
+  friend bool WXDLLEXPORT operator <= (const wxDate &dt1, const wxDate &dt2);
+  friend bool WXDLLEXPORT operator >  (const wxDate &dt1, const wxDate &dt2);
+  friend bool WXDLLEXPORT operator >= (const wxDate &dt1, const wxDate &dt2);
+  friend bool WXDLLEXPORT operator == (const wxDate &dt1, const wxDate &dt2);
+  friend bool WXDLLEXPORT operator != (const wxDate &dt1, const wxDate &dt2);
 
-  friend ostream &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);