Added wxDC::GetPartialTextExtents

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

diff --git a/src/common/datetime.cpp b/src/common/datetime.cpp
index dd2d9dbccb9932d5ead76a9c03ddbcc425f585b1..9c14cc43db07e0f51dca7e3d9af7db60f48f9577 100644 (file)
--- a/src/common/datetime.cpp
+++ b/src/common/datetime.cpp
@@ -839,7 +839,7 @@ void wxDateTime::GetAmPmStrings(wxString *am, wxString *pm)
 {
     tm tm;
     InitTm(tm);
 {
     tm tm;
     InitTm(tm);

-    char buffer[64];
+    wxChar buffer[64];

     // @Note: Do not call 'CallStrftime' here! CallStrftime checks the return code
     // and causes an assertion failed if the buffer is to small (which is good) - OR -
     // if strftime does not return anything because the format string is invalid - OR -
     // @Note: Do not call 'CallStrftime' here! CallStrftime checks the return code
     // and causes an assertion failed if the buffer is to small (which is good) - OR -
     // if strftime does not return anything because the format string is invalid - OR -


@@ -1326,6 +1326,7 @@ wxDateTime& wxDateTime::ResetTime()
 wxDateTime& wxDateTime::SetFromDOS(unsigned long ddt)
 {
     struct tm tm;
 wxDateTime& wxDateTime::SetFromDOS(unsigned long ddt)
 {
     struct tm tm;

+    InitTm(tm);

 
     long year = ddt & 0xFE000000;
     year >>= 25;
 
     long year = ddt & 0xFE000000;
     year >>= 25;


@@ -1886,7 +1887,7 @@ wxDateTime& wxDateTime::SetToYearDay(wxDateTime::wxDateTime_t yday)
         // for Dec, we can't compare with gs_cumulatedDays[mon + 1], but we
         // don't need it neither - because of the CHECK above we know that
         // yday lies in December then
         // for Dec, we can't compare with gs_cumulatedDays[mon + 1], but we
         // don't need it neither - because of the CHECK above we know that
         // yday lies in December then

-        if ( (mon == Dec) || (yday < gs_cumulatedDays[isLeap][mon + 1]) )
+        if ( (mon == Dec) || (yday <= gs_cumulatedDays[isLeap][mon + 1]) )

         {
             Set(yday - gs_cumulatedDays[isLeap][mon], mon, year);
 
         {
             Set(yday - gs_cumulatedDays[isLeap][mon], mon, year);