Getting various compilers to work with wxWin again
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2734 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -668,7 +668,11 @@ bool ConvertOleToVariant(const VARIANTARG& oleVariant, wxVariant& variant)
|
||||
case VT_BOOL:
|
||||
{
|
||||
#if defined(__WATCOMC__) || (defined(_MSC_VER) && (_MSC_VER <= 1000)) //GC
|
||||
#ifndef HAVE_BOOL // Can't use bool operator if no native bool type
|
||||
variant = (long) (oleVariant.bool != 0);
|
||||
#else
|
||||
variant = (bool) (oleVariant.bool != 0);
|
||||
#endif
|
||||
#else
|
||||
variant = (bool) (oleVariant.boolVal != 0);
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user