projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added stub for the new pure virtual DoInsert method
[wxWidgets.git]
/
include
/
wx
/
datetime.h
diff --git
a/include/wx/datetime.h
b/include/wx/datetime.h
index 9ea0f924b6e82bf9cc23aadebef3049580ed7356..c9e9ec35e8fcd3d80bfbd16e9dda1b62bacb80c2 100644
(file)
--- a/
include/wx/datetime.h
+++ b/
include/wx/datetime.h
@@
-7,7
+7,7
@@
// Created: 10.02.99
// RCS-ID: $Id$
// Copyright: (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
// Created: 10.02.99
// RCS-ID: $Id$
// Copyright: (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence: wxWindows licen
s
e
+// Licence: wxWindows licen
c
e
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_DATETIME_H
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_DATETIME_H
@@
-36,7
+36,7
@@
class WXDLLEXPORT wxDateSpan;
// rebuilt)
// For Mingw32, causes a link error. (VZ: why?)
// rebuilt)
// For Mingw32, causes a link error. (VZ: why?)
-#if defined( __WXDEBUG__) && !defined(__MINGW32__) && !
defined(_MSC_VER
)
+#if defined( __WXDEBUG__) && !defined(__MINGW32__) && !
(defined(_MSC_VER) && wxUSE_ACCESSIBILITY
)
#define wxDATETIME_DONT_INLINE
#undef inline
#define wxDATETIME_DONT_INLINE
#undef inline
@@
-50,15
+50,11
@@
class WXDLLEXPORT wxDateSpan;
// set this to the corresponding value in seconds 1/1/1970 has on your
// systems c-runtime
// set this to the corresponding value in seconds 1/1/1970 has on your
// systems c-runtime
-#ifdef __WXMAC__
-#if __MSL__ < 0x6000
+#if defined(__WXMAC__) && !defined(__DARWIN__) && __MSL__ < 0x6000
#define WX_TIME_BASE_OFFSET ( 2082844800L + 126144000L )
#else
#define WX_TIME_BASE_OFFSET 0
#endif
#define WX_TIME_BASE_OFFSET ( 2082844800L + 126144000L )
#else
#define WX_TIME_BASE_OFFSET 0
#endif
-#else
- #define WX_TIME_BASE_OFFSET 0
-#endif
/*
* TODO
*
/*
* TODO
*