Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

warning fixed

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10158 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-05-14 21:28:04 +00:00
parent 788722ac5c
commit f5cd97870d
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/datetime.h
View File

@@ -42,12 +42,12 @@ class WXDLLEXPORT wxDateSpan;
#ifdef __WXMAC__ #ifdef __WXMAC__
#if __MSL__ < 0x6000 #if __MSL__ < 0x6000
#define WX_TIME_BASE_OFFSET ( 2082844800L + 126144000L ) #define WX_TIME_BASE_OFFSET ( 2082844800L + 126144000L )
#else #else
#define WX_TIME_BASE_OFFSET 0 #define WX_TIME_BASE_OFFSET 0
#endif #endif
#else #else
#define WX_TIME_BASE_OFFSET 0 #define WX_TIME_BASE_OFFSET 0
#endif #endif
/* /*
* TODO * TODO

7
src/common/datetime.cpp
View File

@@ -3170,7 +3170,7 @@ const wxChar *wxDateTime::ParseDate(const wxChar *date)
// but we already have a month - maybe we guessed wrong? // but we already have a month - maybe we guessed wrong?
if ( !haveDay ) if ( !haveDay )
{ {
// no need to check in month range as always < 12, but // no need to check in month range as always < 12, but
// the days are counted from 1 unlike the months // the days are counted from 1 unlike the months
day = (wxDateTime_t)mon + 1; day = (wxDateTime_t)mon + 1;
haveDay = TRUE; haveDay = TRUE;
@@ -3180,7 +3180,7 @@ const wxChar *wxDateTime::ParseDate(const wxChar *date)
// could possible be the year (doesn't the year come // could possible be the year (doesn't the year come
// before the month in the japanese format?) (FIXME) // before the month in the japanese format?) (FIXME)
break; break;
} }
} }
mon = mon2; mon = mon2;
@@ -3292,7 +3292,8 @@ const wxChar *wxDateTime::ParseDate(const wxChar *date)
mon = (wxDateTime::Month)(day - 1); mon = (wxDateTime::Month)(day - 1);
// we're in the current year then // we're in the current year then
if ( year <= GetNumOfDaysInMonth(Inv_Year, mon) ) if ( (year > 0) &&
(unsigned)year <= GetNumOfDaysInMonth(Inv_Year, mon) )
{ {
day = year; day = year;