Changed BidEndianOrdered to BigEndianOrdered in datstrm.h

[wxWidgets.git] / src / common / date.cpp

diff --git a/src/common/date.cpp b/src/common/date.cpp
index c8cd9dda8b8c2303d6ce8b32bb14d42ba9da49a9..809730cd698a9f24c77e54d762155fb5a9c4b320 100644 (file)
--- a/src/common/date.cpp
+++ b/src/common/date.cpp
@@ -23,25 +23,19 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+  #pragma hdrstop

 #endif
 
 #endif
 

-#include "wx/setup.h"
-

 #if wxUSE_TIMEDATE
 
 #include "wx/date.h"
 #if wxUSE_TIMEDATE
 
 #include "wx/date.h"

-#include <wx/intl.h>
+#include "wx/intl.h"

 
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 
 
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 

-#if wxUSE_IOSTREAMH
-#include <iostream.h>
-#else
-#include <iostream>
-#endif
+#include "wx/ioswrap.h"

 
 #include <time.h>
 #include <string.h>
 
 #include <time.h>
 #include <string.h>


@@ -276,22 +270,31 @@ bool WXDLLEXPORT operator != (const wxDate &dt1, const wxDate &dt2)
     return ( dt1.julian != dt2.julian );
 }
 
     return ( dt1.julian != dt2.julian );
 }
 

+
+#if wxUSE_STD_IOSTREAM
+

 ////////////////////////////////////////////////////////////////
 // Ostream operations
 ////////////////////////////////////////////////////////////////
 
 ostream WXDLLEXPORT & operator << (ostream &os, const wxDate &dt)
 {
 ////////////////////////////////////////////////////////////////
 // Ostream operations
 ////////////////////////////////////////////////////////////////
 
 ostream WXDLLEXPORT & operator << (ostream &os, const wxDate &dt)
 {

-    return os << (const wxChar *) dt.FormatDate();
+    return os << dt.FormatDate().mb_str();

 }
 
 }
 

+#endif
+

 //////////////////////////////////////////////////////////////
 // Conversion routines
 //////////////////////////////////////////////////////////////
 
 void wxDate::julian_to_wday (void)
 {
 //////////////////////////////////////////////////////////////
 // Conversion routines
 //////////////////////////////////////////////////////////////
 
 void wxDate::julian_to_wday (void)
 {

+    // Correction by Peter Stadel <peters@jetcity.com>
+       day_of_week = ((julian - 2) % 7L);
+/*

     day_of_week = (int) ((julian + 2) % 7 + 1);
     day_of_week = (int) ((julian + 2) % 7 + 1);

+*/

 }
 
 void wxDate::julian_to_mdy ()
 }
 
 void wxDate::julian_to_mdy ()