Attempt to implement a bunch of wx string.h equivalents.

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

diff --git a/src/common/date.cpp b/src/common/date.cpp
index c8cd9dda8b8c2303d6ce8b32bb14d42ba9da49a9..db287ab3168ec88d4559a4fbc5f28841e29498bb 100644 (file)
--- 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 ()