Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed condition of old Watcom times. Open Watcom doesn't have problems with wxAutomationObject.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27525 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2004-05-31 09:45:31 +00:00
parent 42d9875b88
commit 6b12494db9
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/msw/ole/automtn.cpp
View File

@@ -24,7 +24,7 @@
// Watcom C++ gives a linker error if this is compiled in. // Watcom C++ gives a linker error if this is compiled in.
// With Borland C++, all samples crash if this is compiled in. // With Borland C++, all samples crash if this is compiled in.
#if wxUSE_OLE &&!defined(__WATCOMC__) && !(defined(__BORLANDC__) && (__BORLANDC__ < 0x520)) && !defined(__CYGWIN10__) #if wxUSE_OLE && !(defined(__BORLANDC__) && (__BORLANDC__ < 0x520)) && !defined(__CYGWIN10__)
#define _FORCENAMELESSUNION #define _FORCENAMELESSUNION
#include "wx/log.h" #include "wx/log.h"
@@ -599,7 +599,7 @@ bool wxConvertVariantToOle(const wxVariant& variant, VARIANTARG& oleVariant)
{ {
oleVariant.vt = VT_BOOL; oleVariant.vt = VT_BOOL;
// 'bool' required for VC++ 4 apparently // 'bool' required for VC++ 4 apparently
#if defined(__WATCOMC__) || (defined(__VISUALC__) && (__VISUALC__ <= 1000)) #if (defined(__VISUALC__) && (__VISUALC__ <= 1000))
oleVariant.bool = variant.GetBool(); oleVariant.bool = variant.GetBool();
#else #else
oleVariant.boolVal = variant.GetBool(); oleVariant.boolVal = variant.GetBool();
@@ -744,7 +744,7 @@ bool wxConvertOleToVariant(const VARIANTARG& oleVariant, wxVariant& variant)
case VT_BOOL: case VT_BOOL:
{ {
#if defined(__WATCOMC__) || (defined(_MSC_VER) && (_MSC_VER <= 1000) && !defined(__MWERKS__) ) //GC #if (defined(_MSC_VER) && (_MSC_VER <= 1000) && !defined(__MWERKS__) ) //GC
#ifndef HAVE_BOOL // Can't use bool operator if no native bool type #ifndef HAVE_BOOL // Can't use bool operator if no native bool type
variant = (long) (oleVariant.bool != 0); variant = (long) (oleVariant.bool != 0);
#else #else
@@ -1258,5 +1258,5 @@ void ShowException(LPOLESTR szMember, HRESULT hr, EXCEPINFO *pexcep, unsigned in
#endif #endif
#endif // __WATCOMC__ #endif // wxUSE_OLE && !(defined(__BORLANDC__) && (__BORLANDC__ < 0x520)) && !defined(__CYGWIN10__)