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

do not include <windows.h> directly

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42908 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-11-01 14:35:55 +00:00
parent bc119dd506
commit f24a3804a8
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/wx/db.h
View File

@@ -41,12 +41,7 @@
#if wxUSE_MFC #if wxUSE_MFC
#include <afxwin.h> #include <afxwin.h>
#else // !wxUSE_MFC #else // !wxUSE_MFC
#ifndef STRICT #include "wx/msw/wrapwin.h"
#define STRICT 1
#endif
#include <windows.h>
#include "wx/msw/winundef.h"
#endif // wxUSE_MFC/!wxUSE_MFC #endif // wxUSE_MFC/!wxUSE_MFC
// If you use the wxDbCreateDataSource() function with MSW/VC6, // If you use the wxDbCreateDataSource() function with MSW/VC6,
@@ -63,8 +58,7 @@
#include "odbcinst.h" #include "odbcinst.h"
#else #else
#if defined(__WINDOWS__) && ( defined(HAVE_W32API_H) || defined(__BORLANDC__) ) #if defined(__WINDOWS__) && ( defined(HAVE_W32API_H) || defined(__BORLANDC__) )
#include <windows.h> #include "wx/msw/wrapwin.h"
#include "wx/msw/winundef.h"
#endif #endif
extern "C" { extern "C" {
#if defined(wxUSE_BUILTIN_IODBC) && wxUSE_BUILTIN_IODBC #if defined(wxUSE_BUILTIN_IODBC) && wxUSE_BUILTIN_IODBC