{
namedArgCount = 1;
dispIds[1] = DISPID_PROPERTYPUT;
- vReturnPtr = (VARIANTARG*) NULL;
+ vReturnPtr = NULL;
}
// Convert the wxVariants to VARIANTARGs
// Mustn't release the dispatch pointer
if (vReturn.vt == VT_DISPATCH)
{
- vReturn.pdispVal = (IDispatch*) NULL;
+ vReturn.pdispVal = NULL;
}
ReleaseVariant(& vReturn);
}
}
}
- return (WXIDISPATCH*) NULL;
+ return NULL;
}
// Uses DISPATCH_PROPERTYGET
}
}
- return (WXIDISPATCH*) NULL;
+ return NULL;
}
wxDateTime date( variant.GetDateTime() );
oleVariant.vt = VT_DATE;
- long dosDateTime = date.GetAsDOS();
- short dosDate = short((dosDateTime & 0xFFFF0000) >> 16);
- short dosTime = short(dosDateTime & 0xFFFF);
+ SYSTEMTIME st;
+ date.GetAsMSWSysTime(&st);
- DosDateTimeToVariantTime(dosDate, dosTime, & oleVariant.date);
+ SystemTimeToVariantTime(&st, &oleVariant.date);
}
#endif
else if (type == wxT("void*"))
break;
default:
- wxLogDebug(_T("unhandled VT_ARRAY type %x in wxConvertOleToVariant"),
+ wxLogDebug(wxT("unhandled VT_ARRAY type %x in wxConvertOleToVariant"),
oleVariant.vt & VT_TYPEMASK);
variant = wxVariant();
ok = false;
case VT_DATE:
#if wxUSE_DATETIME
{
- unsigned short dosDate = 0;
- unsigned short dosTime = 0;
- VariantTimeToDosDateTime(oleVariant.date, & dosDate, & dosTime);
+ SYSTEMTIME st;
+ VariantTimeToSystemTime(oleVariant.date, &st);
- long dosDateTime = (dosDate << 16) | dosTime;
wxDateTime date;
- date.SetFromDOS(dosDateTime);
+ date.SetFromMSWSysTime(st);
variant = date;
}
#endif // wxUSE_DATETIME