Explicit casting/instantiation to resolve ambiguous overload.

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

diff --git a/src/common/date.cpp b/src/common/date.cpp
index c8cd9dda8b8c2303d6ce8b32bb14d42ba9da49a9..ec7f8d549f11b4a554ef13b5fa2d0f1016582c09 100644 (file)
--- a/src/common/date.cpp
+++ b/src/common/date.cpp
@@ -282,7 +282,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 +291,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 ()