X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/61bfe4b0caa43a95a181baa30d3f6b06778b1d18..cb73e6001f891ae46b12a1e4ca39b93649cb6099:/src/msw/ole/automtn.cpp?ds=inline diff --git a/src/msw/ole/automtn.cpp b/src/msw/ole/automtn.cpp index 4b2b77b108..6b948f8baa 100644 --- a/src/msw/ole/automtn.cpp +++ b/src/msw/ole/automtn.cpp @@ -9,7 +9,7 @@ // Licence: wxWindows Licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "automtn.h" #endif @@ -28,18 +28,28 @@ #define _FORCENAMELESSUNION #include "wx/log.h" +#include "wx/msw/private.h" #include "wx/msw/ole/oleutils.h" #include "wx/msw/ole/automtn.h" -#include "wx/msw/private.h" #include + +#ifdef __WXWINCE__ +#include "wx/msw/wince/time.h" +#else #include +#endif #include #include + #include #define _huge + +#ifndef __WXWINCE__ #include +#endif + #include // Verifies will fail if the needed buffer size is too large @@ -939,7 +949,6 @@ BOOL TmFromOleDate(DATE dtSrc, struct tm& tmDest) if (dtSrc > MAX_DATE || dtSrc < MIN_DATE) // about year 100 to about 9999 return FALSE; - long nDays; // Number of days since Dec. 30, 1899 long nDaysAbsolute; // Number of days since 1/1/0 long nSecsInDay; // Time in seconds since midnight long nMinutesInDay; // Minutes in day @@ -954,9 +963,6 @@ BOOL TmFromOleDate(DATE dtSrc, struct tm& tmDest) double dblDate = dtSrc; // tempory serial date - // If a valid date, then this conversion should not overflow - nDays = (long)dblDate; - // Round to the second dblDate += ((dtSrc > 0.0) ? HALF_SECOND : -HALF_SECOND);