1. bug in wxSplitter corrected: mouse event coords may be negative when the

[wxWidgets.git] / src / msw / ole / automtn.cpp

diff --git a/src/msw/ole/automtn.cpp b/src/msw/ole/automtn.cpp
index 108c2948b0a47cf246d54ef0a8bb19b6a095e922..8a8babc89a9de065bea0cfafe4e2722438ca7a75 100644 (file)
--- a/src/msw/ole/automtn.cpp
+++ b/src/msw/ole/automtn.cpp
@@ -21,17 +21,16 @@
 #endif
 
 #include "wx/log.h"
 #endif
 
 #include "wx/log.h"

-#include "wx/msw/ole/automtn.h"

 
 

-#include <windows.h>
-#include <ole2ver.h>
-#include <oleauto.h>

 #include <math.h>
 #include <time.h>
 
 #include <math.h>
 #include <time.h>
 

-#ifdef GetObject
-#undef GetObject
-#endif
+#include "wx/msw/ole/automtn.h"
+
+#include "wx/msw/private.h"
+
+#include <ole2ver.h>
+#include <oleauto.h>

 
 // wrapper around BSTR type (by Vadim Zeitlin)
 
 
 // wrapper around BSTR type (by Vadim Zeitlin)
 


@@ -540,7 +539,7 @@ bool ConvertVariantToOle(const wxVariant& variant, VARIANTARG& oleVariant)
     {
         oleVariant.vt = VT_BOOL;
         // 'bool' required for VC++ 4 apparently
     {
         oleVariant.vt = VT_BOOL;
         // 'bool' required for VC++ 4 apparently

-#if defined(__WATCOMC__) || (defined(_MSC_VER) && (_MSC_VER <= 1000))
+#if defined(__WATCOMC__) || (defined(__VISUALC__) && (__VISUALC__ <= 1000))

         oleVariant.bool = variant.GetBool();
 #else
         oleVariant.boolVal = variant.GetBool();
         oleVariant.bool = variant.GetBool();
 #else
         oleVariant.boolVal = variant.GetBool();


@@ -668,7 +667,7 @@ bool ConvertOleToVariant(const VARIANTARG& oleVariant, wxVariant& variant)
 
        case VT_BOOL:
                {
 
        case VT_BOOL:
                {

-#ifdef __WATCOMC__
+#if defined(__WATCOMC__) || (defined(_MSC_VER) && (_MSC_VER <= 1000)) //GC

                        variant = (bool) (oleVariant.bool != 0);
 #else
                        variant = (bool) (oleVariant.boolVal != 0);
                        variant = (bool) (oleVariant.bool != 0);
 #else
                        variant = (bool) (oleVariant.boolVal != 0);