X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/509201463dbd3bce8aff762c664b111a8f2c3412..76784eecd960198bc54429a6e16d5bd7af458fce:/src/common/date.cpp diff --git a/src/common/date.cpp b/src/common/date.cpp index c8cd9dda8b..4d8a901c8c 100644 --- a/src/common/date.cpp +++ b/src/common/date.cpp @@ -23,11 +23,9 @@ #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif -#include "wx/setup.h" - #if wxUSE_TIMEDATE #include "wx/date.h" @@ -282,7 +280,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 +289,11 @@ ostream WXDLLEXPORT & operator << (ostream &os, const wxDate &dt) void wxDate::julian_to_wday (void) { + // Correction by Peter Stadel + day_of_week = ((julian - 2) % 7L); +/* day_of_week = (int) ((julian + 2) % 7 + 1); +*/ } void wxDate::julian_to_mdy ()