1. minor headers rearrangement: wxprec.h doesn't include setup.h directly

any more, btu defs.h does - and not in the very beginning, but a bit
   later
2. some unused and uncompileable OS2 thing removed from string.cpp


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3242 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-08-02 21:31:09 +00:00
parent e46286351d
commit d22699b5eb
8 changed files with 65 additions and 58 deletions

View File

@@ -9,10 +9,11 @@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#include "wx/setup.h" // always include this file (under Unix it's generated by configure)
#include "wx/defs.h" // compiler definitions
// compiler detection; includes setup.h
#include "wx/defs.h"
// check if to use precompiled headers
// check if to use precompiled headers: do it for most Windows compilers unless
// explicitly disabled by defining NOPCH
#if ((defined(__BORLANDC__) || defined(__VISUALC__) || defined(__WATCOMC__)) && defined(__WXMSW__)) || defined(__WXPM__)
#if !defined(NOPCH)
#define WX_PRECOMP
@@ -21,19 +22,18 @@
// For some reason, this must be defined for common dialogs to work.
#ifdef __WATCOMC__
#define INCLUDE_COMMDLG_H 1
#define INCLUDE_COMMDLG_H 1
#endif
// include the wx definitions
#ifdef WX_PRECOMP
// include standard Windows headers
#ifdef __WXMSW__
#include <windows.h>
#include "wx/msw/winundef.h"
#include <windows.h>
#include "wx/msw/winundef.h"
#endif
// include the most common wx headers
#include "wx/wx.h"
#endif // WX_PRECOMP
#endif // WX_PRECOMP