xti additions / changes, trying to reduce dependencies

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

diff --git a/src/msw/ole/access.cpp b/src/msw/ole/access.cpp
index 05d2d1c7ad27c345cf8be1cd0f8780ec937a9261..22251ebae9867a4e2e2579e30aa28a86e2aacffc 100644 (file)
--- a/src/msw/ole/access.cpp
+++ b/src/msw/ole/access.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

   #pragma implementation "access.h"
 #endif
 
   #pragma implementation "access.h"
 #endif
 


@@ -38,7 +38,7 @@
 #include "wx/log.h"
 #include "wx/access.h"
 
 #include "wx/log.h"
 #include "wx/access.h"
 

-#include <windows.h>
+#include "wx/msw/wrapwin.h"

 
 // for some compilers, the entire ole2.h must be included, not only oleauto.h
 #if wxUSE_NORLANDER_HEADERS || defined(__WATCOMC__)
 
 // for some compilers, the entire ole2.h must be included, not only oleauto.h
 #if wxUSE_NORLANDER_HEADERS || defined(__WATCOMC__)


@@ -49,7 +49,6 @@
 #include <oleacc.h>
 #include <winable.h>
 
 #include <oleacc.h>
 #include <winable.h>
 

-#include "wx/msw/winundef.h"

 #include "wx/msw/ole/oleutils.h"
 
 #ifndef CHILDID_SELF
 #include "wx/msw/ole/oleutils.h"
 
 #ifndef CHILDID_SELF