AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

warning fixed

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4008 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 1999-10-15 17:47:34 +00:00
parent d64af447da
commit 729d8f9158
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/common/date.cpp
View File

@ -291,7 +291,7 @@ ostream WXDLLEXPORT & operator << (ostream &os, const wxDate &dt)
void wxDate::julian_to_wday (void) void wxDate::julian_to_wday (void)
{ {
// Correction by Peter Stadel <peters@jetcity.com> // Correction by Peter Stadel <peters@jetcity.com>
day_of_week = ((julian - 2) % 7L); day_of_week = (int)((julian - 2) % 7L);
/* /*
day_of_week = (int) ((julian + 2) % 7 + 1); day_of_week = (int) ((julian + 2) % 7 + 1);
*/ */
@ -359,7 +359,7 @@ wxString wxDate::FormatDate (int type) const
wxStrcpy(buf, _("invalid day")); wxStrcpy(buf, _("invalid day"));
else else
wxStrncpy( buf, wxGetTranslation(dayname[day_of_week-1]), wxStrncpy( buf, wxGetTranslation(dayname[day_of_week-1]),
(DisplayOptions & wxDATE_ABBR) ? ABBR_LENGTH : 9); (DisplayOptions & wxDATE_ABBR) ? ABBR_LENGTH : 9);
return wxString(buf); return wxString(buf);
case wxMONTH: case wxMONTH:
@ -367,7 +367,7 @@ wxString wxDate::FormatDate (int type) const
wxStrcpy(buf, _("invalid month")); wxStrcpy(buf, _("invalid month"));
else else
wxStrncpy( buf, wxGetTranslation(mname[month-1]), wxStrncpy( buf, wxGetTranslation(mname[month-1]),
(DisplayOptions & wxDATE_ABBR) ? ABBR_LENGTH : 9); (DisplayOptions & wxDATE_ABBR) ? ABBR_LENGTH : 9);
return wxString(buf); return wxString(buf);
case wxFULL: case wxFULL:
@ -378,10 +378,10 @@ wxString wxDate::FormatDate (int type) const
return wxString(buf); return wxString(buf);
} }
wxStrncpy( buf, wxGetTranslation(dayname[day_of_week-1]), wxStrncpy( buf, wxGetTranslation(dayname[day_of_week-1]),
(DisplayOptions & wxDATE_ABBR) ? ABBR_LENGTH : 9); (DisplayOptions & wxDATE_ABBR) ? ABBR_LENGTH : 9);
wxStrcat( buf, wxT(", ")); wxStrcat( buf, wxT(", "));
wxStrncat( buf, wxGetTranslation(mname[month-1]), wxStrncat( buf, wxGetTranslation(mname[month-1]),
(DisplayOptions & wxDATE_ABBR) ? ABBR_LENGTH : 9); (DisplayOptions & wxDATE_ABBR) ? ABBR_LENGTH : 9);
wxStrcat( buf, wxT(" ")); wxStrcat( buf, wxT(" "));
wxSprintf( buf+wxStrlen(buf), wxT("%d, %d"), day, abs(year) ); wxSprintf( buf+wxStrlen(buf), wxT("%d, %d"), day, abs(year) );
if (year < 0) if (year < 0)
@ -409,9 +409,9 @@ wxString wxDate::FormatDate (int type) const
wxStrcpy(buf, _("invalid date")); wxStrcpy(buf, _("invalid date"));
else else
wxSprintf( buf+wxStrlen(buf), wxT("%1d/%1d/%02d"), month, day, wxSprintf( buf+wxStrlen(buf), wxT("%1d/%1d/%02d"), month, day,
(DisplayOptions & wxNO_CENTURY) && (abs(year) > 1899) (DisplayOptions & wxNO_CENTURY) && (abs(year) > 1899)
? (abs(year) - (abs(year) / 100 * 100)) ? (abs(year) - (abs(year) / 100 * 100))
: (abs(year)) ); : (abs(year)) );
return wxString(buf); return wxString(buf);
} }
return wxString(wxT("")); return wxString(wxT(""));