X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/509201463dbd3bce8aff762c664b111a8f2c3412..b0655a87f40073577bdb8ba4378e5e683a163d44:/src/common/date.cpp

diff --git a/src/common/date.cpp b/src/common/date.cpp
index c8cd9dda8b..db287ab316 100644
--- a/src/common/date.cpp
+++ b/src/common/date.cpp
@@ -23,10 +23,12 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+  #pragma hdrstop
 #endif
 
-#include "wx/setup.h"
+#ifndef WX_PRECOMP
+  #include "wx/defs.h"
+#endif
 
 #if wxUSE_TIMEDATE
 
@@ -282,7 +284,7 @@ bool WXDLLEXPORT operator != (const wxDate &dt1, const wxDate &dt2)
 
 ostream WXDLLEXPORT & operator << (ostream &os, const wxDate &dt)
 {
-    return os << (const wxChar *) dt.FormatDate();
+    return os << dt.FormatDate().mb_str();
 }
 
 //////////////////////////////////////////////////////////////
@@ -291,7 +293,11 @@ ostream WXDLLEXPORT & operator << (ostream &os, const wxDate &dt)
 
 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);
+*/
 }
 
 void wxDate::julian_to_mdy ()