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 782f1d7a30f86342fe89008482e23a60c6bd9be7..9ebe1845e3b47ea2984f28ce2812860d9504b45d 100644 (file)
--- a/src/common/dcbase.cpp
+++ b/src/common/dcbase.cpp
@@ -1115,8 +1115,9 @@ void wxDCBase::CalculateEllipticPoints( wxList* points,
     }
     else
     {
     }
     else
     {

+        wxNode* node;

         // copy whole ellipse, wxPoints will be deleted outside
         // 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 );
         {
             wxObject *p = node->Data();
             points->Append( p );

diff --git a/src/msw/ole/activex.cpp b/src/msw/ole/activex.cpp
index 176fc6673fea4d0ebd2a8cd8bdbc46913586910a..a689f525dd30c5b8c23d1a2ef64d938bce89fa72 100644 (file)
--- 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
     HRESULT STDMETHODCALLTYPE LockContainer(BOOL){return S_OK;}
     //********************IOleItemContainer***************************
     HRESULT STDMETHODCALLTYPE

-    #ifdef __WXWINCE__
+    #if defined(__WXWINCE__) && __VISUALC__ < 1400

     GetObject
     #elif defined(_UNICODE)
     GetObjectW
     GetObject
     #elif defined(_UNICODE)
     GetObjectW