warning fixed

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10158 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/datetime.h b/include/wx/datetime.h
index 55484c7b478eb22cc7442c729c1398248da2e856..92398e53f2ae1e2893a897fa42d40de4a6e23c3f 100644 (file)
--- a/include/wx/datetime.h
+++ b/include/wx/datetime.h
@@ -42,12 +42,12 @@ class WXDLLEXPORT wxDateSpan;
 
 #ifdef __WXMAC__
 #if __MSL__ < 0x6000
 
 #ifdef __WXMAC__
 #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
 #else
 #endif
 #else

-       #define WX_TIME_BASE_OFFSET 0
+    #define WX_TIME_BASE_OFFSET 0

 #endif
 /*
  * TODO
 #endif
 /*
  * TODO

diff --git a/src/common/datetime.cpp b/src/common/datetime.cpp
index 2874bc6519f40a09146aff3cc5d1eb2f571ee97c..987c81218330e8e0477b4a18e59c0af064f151f2 100644 (file)
--- a/src/common/datetime.cpp
+++ b/src/common/datetime.cpp
@@ -3170,7 +3170,7 @@ const wxChar *wxDateTime::ParseDate(const wxChar *date)
                     // but we already have a month - maybe we guessed wrong?
                     if ( !haveDay )
                     {
                     // but we already have a month - maybe we guessed wrong?
                     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
                         day = (wxDateTime_t)mon + 1;
                         haveDay = TRUE;
                         // the days are counted from 1 unlike the months
                         day = (wxDateTime_t)mon + 1;
                         haveDay = TRUE;


@@ -3180,7 +3180,7 @@ const wxChar *wxDateTime::ParseDate(const wxChar *date)
                         // could possible be the year (doesn't the year come
                         // before the month in the japanese format?) (FIXME)
                         break;
                         // could possible be the year (doesn't the year come
                         // before the month in the japanese format?) (FIXME)
                         break;

-                       }
+                    }

                 }
 
                 mon = mon2;
                 }
 
                 mon = mon2;


@@ -3292,7 +3292,8 @@ const wxChar *wxDateTime::ParseDate(const wxChar *date)
                 mon = (wxDateTime::Month)(day - 1);
 
                 // we're in the current year then
                 mon = (wxDateTime::Month)(day - 1);
 
                 // 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;