Upport scrolling changes and mouse wheel changes.

[wxWidgets.git] / wxPython / contrib / activex / wxie / wxactivex.cpp

diff --git a/wxPython/contrib/activex/wxie/wxactivex.cpp b/wxPython/contrib/activex/wxie/wxactivex.cpp
index 39b178e441df15085e0c80c1b4b372221ea4722e..ed8b6df44f188b7e02379abc1523ceb3e4996e61 100644 (file)
--- a/wxPython/contrib/activex/wxie/wxactivex.cpp
+++ b/wxPython/contrib/activex/wxie/wxactivex.cpp
@@ -622,9 +622,9 @@ bool MSWVariantToVariant(VARIANTARG& va, wxVariant& vx)
     case VT_I1:
     case VT_UI1:
         if (byRef)
-            vx = (char) *va.pbVal;
+            vx = (wxChar) *va.pbVal;
         else
-            vx = (char) va.bVal;
+            vx = (wxChar) va.bVal;
         return true;
 
     // 2 byte shorts
@@ -757,9 +757,9 @@ bool VariantToMSWVariant(const wxVariant& vx, VARIANTARG& va)
     case VT_I1:
     case VT_UI1:
         if (byRef)
-            *va.pbVal = (char) vx;
+            *va.pbVal = (wxChar) vx;
         else
-            va.bVal = (char) vx;
+            va.bVal = (wxChar) vx;
         return true;
 
     // 2 byte shorts
@@ -1172,7 +1172,8 @@ void wxActiveX::GetTypeInfo(ITypeInfo *ti, bool defInterface, bool defEventSink)
 
         // Get properties
         // See bug #1280715 in the wxActiveX SF project
-        for (int i = 0; i < ta->cVars; i++) {
+        int i;
+        for (i = 0; i < ta->cVars; i++) {
             VARDESC FAR *vd = NULL;
 
             typeInfo->GetVarDesc(i, &vd) ;
@@ -1197,7 +1198,7 @@ void wxActiveX::GetTypeInfo(ITypeInfo *ti, bool defInterface, bool defEventSink)
         }        
 
         // Get Function Names
-        for (int i = 0; i < ta->cFuncs; i++)
+        for (i = 0; i < ta->cFuncs; i++)
         {
             FUNCDESC FAR *fd = NULL;
 
@@ -1705,7 +1706,6 @@ void wxActiveX::OnPaint(wxPaintEvent& event)
 {
     wxLogTrace(wxT(""),wxT("repainting activex win"));
     wxPaintDC dc(this);
-    dc.BeginDrawing();
     int w, h;
     GetSize(&w, &h);
     RECT posRect;
@@ -1730,7 +1730,6 @@ void wxActiveX::OnPaint(wxPaintEvent& event)
         dc.DrawRectangle(0, 0, w, h);
         dc.SetBrush(wxNullBrush);
     }
-    dc.EndDrawing();
 }