Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

compilation fixes for OpenWatcom

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18864 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2003-01-22 17:19:23 +00:00
parent c9b6238d67
commit a7b4607f4a
3 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/wx/msw/ole/oleutils.h
View File

@@ -18,9 +18,8 @@
#include "wx/defs.h" #include "wx/defs.h"
#if wxUSE_NORLANDER_HEADERS // get IUnknown, REFIID &c
#include <ole2.h> #include <ole2.h>
#endif
// ============================================================================ // ============================================================================
// General purpose functions and macros // General purpose functions and macros

10
src/msw/ole/dataobj.cpp
View File

@@ -39,16 +39,12 @@
#include "wx/msw/private.h" // includes <windows.h> #include "wx/msw/private.h" // includes <windows.h>
#if wxUSE_NORLANDER_HEADERS // for some compilers, the entire ole2.h must be included, not only oleauto.h
#if wxUSE_NORLANDER_HEADERS || defined(__WATCOMC__)
#include <ole2.h> #include <ole2.h>
#endif #endif
#include <oleauto.h> #include <oleauto.h>
#ifndef __WIN32__
#include <ole2.h>
#include <olestd.h>
#endif
#include <shlobj.h> #include <shlobj.h>
#include "wx/msw/ole/oleutils.h" #include "wx/msw/ole/oleutils.h"

8
src/msw/ole/dropsrc.cpp
View File

@@ -40,15 +40,11 @@
#include <windows.h> #include <windows.h>
#if wxUSE_NORLANDER_HEADERS // for some compilers, the entire ole2.h must be included, not only oleauto.h
#if wxUSE_NORLANDER_HEADERS || defined(__WATCOMC__)
#include <ole2.h> #include <ole2.h>
#endif #endif
#ifndef __WIN32__
#include <ole2.h>
#include <olestd.h>
#endif
#include <oleauto.h> #include <oleauto.h>
#include "wx/msw/ole/oleutils.h" #include "wx/msw/ole/oleutils.h"