From e6bdaaad1dbc577bb5448b55779f50ea3cb2b563 Mon Sep 17 00:00:00 2001 From: Michael Wetherell Date: Sun, 27 Feb 2005 20:31:24 +0000 Subject: [PATCH] Move wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW out of the common section in setup_inc.h to tackle the problem raised by patch 1152046. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32430 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/mac/setup0.h | 4 ---- include/wx/msw/setup0.h | 8 ++++---- include/wx/msw/setup_microwin.h | 8 ++++---- include/wx/msw/wince/setup.h | 8 ++++---- include/wx/palmos/setup0.h | 8 ++++---- include/wx/setup_inc.h | 4 ---- include/wx/univ/setup0.h | 16 ++++++++-------- setup.h.in | 13 +++++-------- 8 files changed, 29 insertions(+), 40 deletions(-) diff --git a/include/wx/mac/setup0.h b/include/wx/mac/setup0.h index cb0d271e0c..4feecf90c6 100644 --- a/include/wx/mac/setup0.h +++ b/include/wx/mac/setup0.h @@ -948,10 +948,6 @@ // Set to 1 to use font metric files in GetTextExtent #define wxUSE_AFM_FOR_POSTSCRIPT 1 -// Set to 0 to disable PostScript print/preview architecture code under Windows -// (just use Windows printing). -#define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1 - // ---------------------------------------------------------------------------- // database classes // ---------------------------------------------------------------------------- diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h index fd814ff1c9..10f096380c 100644 --- a/include/wx/msw/setup0.h +++ b/include/wx/msw/setup0.h @@ -947,10 +947,6 @@ // Set to 1 to use font metric files in GetTextExtent #define wxUSE_AFM_FOR_POSTSCRIPT 1 -// Set to 0 to disable PostScript print/preview architecture code under Windows -// (just use Windows printing). -#define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1 - // ---------------------------------------------------------------------------- // database classes // ---------------------------------------------------------------------------- @@ -1074,6 +1070,10 @@ // Set this to 1 to enable wxDIB #define wxUSE_WXDIB 1 +// Set to 0 to disable PostScript print/preview architecture code under Windows +// (just use Windows printing). +#define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1 + // Define as 1 to use Microsoft's ItsyBitsy small title bar library, for // wxMiniFrame. This setting is only used for Win3.1; Win9x and NT use native // miniframes support instead. diff --git a/include/wx/msw/setup_microwin.h b/include/wx/msw/setup_microwin.h index 8f291d8ecd..5cd347c67c 100644 --- a/include/wx/msw/setup_microwin.h +++ b/include/wx/msw/setup_microwin.h @@ -808,10 +808,6 @@ // Set to 1 to use font metric files in GetTextExtent #define wxUSE_AFM_FOR_POSTSCRIPT 0 -// Set to 0 to disable PostScript print/preview architecture code under Windows -// (just use Windows printing). -#define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 0 - // ---------------------------------------------------------------------------- // database classes // ---------------------------------------------------------------------------- @@ -933,6 +929,10 @@ #define wxUSE_CTL3D 1 #endif +// Set to 0 to disable PostScript print/preview architecture code under Windows +// (just use Windows printing). +#define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 0 + // Define as 1 to use Microsoft's ItsyBitsy small title bar library, for // wxMiniFrame. This setting is only used for Win3.1; Win9x and NT use native // miniframes support instead. diff --git a/include/wx/msw/wince/setup.h b/include/wx/msw/wince/setup.h index 53396dff91..4c3a8483a1 100644 --- a/include/wx/msw/wince/setup.h +++ b/include/wx/msw/wince/setup.h @@ -919,10 +919,6 @@ // Set to 1 to use font metric files in GetTextExtent #define wxUSE_AFM_FOR_POSTSCRIPT 0 -// Set to 0 to disable PostScript print/preview architecture code under Windows -// (just use Windows printing). -#define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 0 - // ---------------------------------------------------------------------------- // database classes // ---------------------------------------------------------------------------- @@ -1034,6 +1030,10 @@ // Recommended setting: 1 #define wxUSE_OLE 1 +// Set to 0 to disable PostScript print/preview architecture code under Windows +// (just use Windows printing). +#define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 0 + // Define as 1 to use Microsoft's ItsyBitsy small title bar library, for // wxMiniFrame. This setting is only used for Win3.1; Win9x and NT use native // miniframes support instead. diff --git a/include/wx/palmos/setup0.h b/include/wx/palmos/setup0.h index e124c1ab56..256b740294 100644 --- a/include/wx/palmos/setup0.h +++ b/include/wx/palmos/setup0.h @@ -914,10 +914,6 @@ // Set to 1 to use font metric files in GetTextExtent #define wxUSE_AFM_FOR_POSTSCRIPT 0 -// Set to 0 to disable PostScript print/preview architecture code under Windows -// (just use Windows printing). -#define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 0 - // ---------------------------------------------------------------------------- // database classes // ---------------------------------------------------------------------------- @@ -1029,6 +1025,10 @@ // Recommended setting: 1 #define wxUSE_OLE 0 +// Set to 0 to disable PostScript print/preview architecture code under Windows +// (just use Windows printing). +#define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 0 + // Define as 1 to use Microsoft's ItsyBitsy small title bar library, for // wxMiniFrame. This setting is only used for Win3.1; Win9x and NT use native // miniframes support instead. diff --git a/include/wx/setup_inc.h b/include/wx/setup_inc.h index d05c40db5f..91b4e5707c 100644 --- a/include/wx/setup_inc.h +++ b/include/wx/setup_inc.h @@ -932,10 +932,6 @@ // Set to 1 to use font metric files in GetTextExtent #define wxUSE_AFM_FOR_POSTSCRIPT 1 -// Set to 0 to disable PostScript print/preview architecture code under Windows -// (just use Windows printing). -#define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1 - // ---------------------------------------------------------------------------- // database classes // ---------------------------------------------------------------------------- diff --git a/include/wx/univ/setup0.h b/include/wx/univ/setup0.h index 0507846204..9e8a8722f9 100644 --- a/include/wx/univ/setup0.h +++ b/include/wx/univ/setup0.h @@ -995,14 +995,6 @@ // Set to 1 to use font metric files in GetTextExtent #define wxUSE_AFM_FOR_POSTSCRIPT 1 -// Set to 0 to disable PostScript print/preview architecture code under Windows -// (just use Windows printing). -#if defined(__WIN32__) - #define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1 -#else - #define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 0 -#endif - // ---------------------------------------------------------------------------- // database classes // ---------------------------------------------------------------------------- @@ -1117,6 +1109,14 @@ // Recommended setting: 1 for WIN32 #define wxUSE_OLE 1 +// Set to 0 to disable PostScript print/preview architecture code under Windows +// (just use Windows printing). +#if defined(__WIN32__) + #define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1 +#else + #define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 0 +#endif + // Define as 1 to use Microsoft's ItsyBitsy small title bar library, for // wxMiniFrame. This setting is only used for Win3.1; Win9x and NT use native // miniframes support instead. diff --git a/setup.h.in b/setup.h.in index 0d20029b85..67270d612e 100644 --- a/setup.h.in +++ b/setup.h.in @@ -161,12 +161,7 @@ #define wxUSE_DEBUG_NEW_ALWAYS 0 -#if defined(_MSC_VER) || \ - (defined(__BORLANDC__) && __BORLANDC__ >= 0x0550) - #define wxUSE_ON_FATAL_EXCEPTION 0 -#else - #define wxUSE_ON_FATAL_EXCEPTION 0 -#endif +#define wxUSE_ON_FATAL_EXCEPTION 0 #define wxUSE_STACKWALKER 0 @@ -449,8 +444,6 @@ #define wxUSE_AFM_FOR_POSTSCRIPT 0 -#define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 0 - #define wxUSE_ODBC 0 @@ -968,6 +961,10 @@ with wx/msw/setup.h */ #define wxUSE_XPM_IN_MSW wxUSE_XPM +// Set to 0 to disable PostScript print/preview architecture code under Windows +// (just use Windows printing). +#define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1 + #endif /* __WIN32__ */ /* --------------------------------------------------------* -- 2.47.2