From: Julian Smart <julian@anthemion.co.uk>
Date: Wed, 15 Mar 2006 08:44:28 +0000 (+0000)
Subject: Fix compile problem with VS 2005
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/b1c6a00e631be013b9dc3eb43959c80369a99e56

Fix compile problem with VS 2005


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38092 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/common/dcbase.cpp b/src/common/dcbase.cpp
index 782f1d7a30..9ebe1845e3 100644
--- a/src/common/dcbase.cpp
+++ b/src/common/dcbase.cpp
@@ -1115,8 +1115,9 @@ void wxDCBase::CalculateEllipticPoints( wxList* points,
     }
     else
     {
+        wxNode* node;
         // copy whole ellipse, wxPoints will be deleted outside
-        for( wxNode *node = pointsarray[0].First(); node; node = node->Next() )
+        for( node = pointsarray[0].First(); node; node = node->Next() )
         {
             wxObject *p = node->Data();
             points->Append( p );
diff --git a/src/msw/ole/activex.cpp b/src/msw/ole/activex.cpp
index 176fc6673f..a689f525dd 100644
--- a/src/msw/ole/activex.cpp
+++ b/src/msw/ole/activex.cpp
@@ -523,7 +523,7 @@ public:
     HRESULT STDMETHODCALLTYPE LockContainer(BOOL){return S_OK;}
     //********************IOleItemContainer***************************
     HRESULT STDMETHODCALLTYPE
-    #ifdef __WXWINCE__
+    #if defined(__WXWINCE__) && __VISUALC__ < 1400
     GetObject
     #elif defined(_UNICODE)
     GetObjectW