From 40973ea5fd3b23a02d14f1cc902e6cf01735e9ab Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 23 Dec 1999 23:27:21 +0000 Subject: [PATCH] removed testing code from wxLongLong git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5096 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/longlong.h | 2 +- include/wx/msw/setup0.h | 33 +++++++++++++++++++++++++++++---- src/common/datetime.cpp | 4 ++-- 3 files changed, 32 insertions(+), 7 deletions(-) diff --git a/include/wx/longlong.h b/include/wx/longlong.h index 454d7e5b8d..562c1e1de4 100644 --- a/include/wx/longlong.h +++ b/include/wx/longlong.h @@ -25,7 +25,7 @@ #include // for LONG_MAX -#define wxUSE_LONGLONG_WX 1 +// #define wxUSE_LONGLONG_WX 1 -- for testing (VZ) // ---------------------------------------------------------------------------- // decide upon which class we will use diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h index 52fc43a9ec..e4a18d95fb 100644 --- a/include/wx/msw/setup0.h +++ b/include/wx/msw/setup0.h @@ -44,9 +44,37 @@ #define wxICON_IS_BITMAP 0 // ---------------------------------------------------------------------------- -// General features +// non GUI features selection // ---------------------------------------------------------------------------- +// Set wxUSE_LONGLONG to 1 to compile the wxLongLong class. This is a 64 bit +// integer which is implemented in terms of native 64 bit integers if any or +// uses emulation otherwise. +// +// This class is required by wxDateTime and so you should enable it if you want +// to use wxDateTime. For most modern platforms, it will use the native 64 bit +// integers in which case (almost) all of its functions are inline and it +// almost does not take any space, so there should be no reason to switch it +// off. +// +// Recommended setting: 1 +#define wxUSE_LONGLONG 1 + +// Set wxUSE_TIMEDATE to 1 to compile the wxDateTime and related classes which +// allow to manipulate dates, times and time intervals. wxDateTime replaces the +// old wxTime and wxDate classes which are still provided for backwards +// compatibility (and implemented in terms of wxDateTime). +// +// Note that this class is relatively new and is still officially in alpha +// stage because some features are not yet (fully) implemented. It is already +// quite useful though and should only be disabled if you are aiming at +// absolutely minimal version of the library. +// +// Requires: wxUSE_LONGLONG +// +// Recommended setting: 1 +#define wxUSE_TIMEDATE 1 + // Setting wxUSE_CONFIG to 1 enables the use of wxConfig and related classes // which allow the application to store its settings in the persistent // storage. Setting this to 1 will also enable on-demand creation of the @@ -117,9 +145,6 @@ #define wxUSE_CONSTRAINTS 1 // 0 for no window layout constraint system -#define wxUSE_TIMEDATE 1 - // 0 for no wxTime/wxDate classes - #define wxUSE_CLIPBOARD 1 // 0 for no clipboard functions diff --git a/src/common/datetime.cpp b/src/common/datetime.cpp index 8685319432..8cd374b31f 100644 --- a/src/common/datetime.cpp +++ b/src/common/datetime.cpp @@ -2196,7 +2196,7 @@ const wxChar *wxDateTime::ParseRfc822Date(const wxChar* date) } // and now the interesting part: the timezone - wxDateTime_t offset; + int offset; if ( *p == _T('-') || *p == _T('+') ) { // the explicit offset given: it has the form of hhmm @@ -2293,7 +2293,7 @@ const wxChar *wxDateTime::ParseRfc822Date(const wxChar* date) // the spec was correct Set(day, mon, year, hour, min, sec); - MakeTimezone(60*offset); + MakeTimezone(60*(wxDateTime_t)offset); return p; } -- 2.47.2