wx/wxprec.h already includes wx/defs.h (with other minor cleaning).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38791 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -13,11 +13,9 @@
|
||||
#include "wx/wxprec.h"
|
||||
|
||||
#if defined(__BORLANDC__)
|
||||
#pragma hdrstop
|
||||
#pragma hdrstop
|
||||
#endif
|
||||
|
||||
#include "wx/defs.h"
|
||||
|
||||
// Watcom C++ gives a linker error if this is compiled in.
|
||||
// With Borland C++, all samples crash if this is compiled in.
|
||||
#if wxUSE_OLE && !(defined(__BORLANDC__) && (__BORLANDC__ < 0x520)) && !defined(__CYGWIN10__)
|
||||
@@ -595,11 +593,11 @@ WXDLLEXPORT bool wxConvertVariantToOle(const wxVariant& variant, VARIANTARG& ole
|
||||
{
|
||||
wxDateTime date( variant.GetDateTime() );
|
||||
oleVariant.vt = VT_DATE;
|
||||
|
||||
|
||||
long dosDateTime = date.GetAsDOS();
|
||||
short dosDate = short((dosDateTime & 0xFFFF0000) >> 16);
|
||||
short dosTime = short(dosDateTime & 0xFFFF);
|
||||
|
||||
|
||||
DosDateTimeToVariantTime(dosDate, dosTime, & oleVariant.date);
|
||||
}
|
||||
#endif
|
||||
@@ -682,7 +680,7 @@ WXDLLEXPORT bool wxConvertOleToVariant(const VARIANTARG& oleVariant, wxVariant&
|
||||
unsigned short dosDate = 0;
|
||||
unsigned short dosTime = 0;
|
||||
VariantTimeToDosDateTime(oleVariant.date, & dosDate, & dosTime);
|
||||
|
||||
|
||||
long dosDateTime = (dosDate << 16) || dosTime;
|
||||
wxDateTime date;
|
||||
date.SetFromDOS(dosDateTime);
|
||||
|
Reference in New Issue
Block a user