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
This commit is contained in:
Michael Wetherell
2005-02-27 20:31:24 +00:00
parent 86e9492322
commit e6bdaaad1d
8 changed files with 29 additions and 40 deletions

View File

@@ -948,10 +948,6 @@
// Set to 1 to use font metric files in GetTextExtent // Set to 1 to use font metric files in GetTextExtent
#define wxUSE_AFM_FOR_POSTSCRIPT 1 #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 // database classes
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------

View File

@@ -947,10 +947,6 @@
// Set to 1 to use font metric files in GetTextExtent // Set to 1 to use font metric files in GetTextExtent
#define wxUSE_AFM_FOR_POSTSCRIPT 1 #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 // database classes
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@@ -1074,6 +1070,10 @@
// Set this to 1 to enable wxDIB // Set this to 1 to enable wxDIB
#define wxUSE_WXDIB 1 #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 // 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 // wxMiniFrame. This setting is only used for Win3.1; Win9x and NT use native
// miniframes support instead. // miniframes support instead.

View File

@@ -808,10 +808,6 @@
// Set to 1 to use font metric files in GetTextExtent // Set to 1 to use font metric files in GetTextExtent
#define wxUSE_AFM_FOR_POSTSCRIPT 0 #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 // database classes
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@@ -933,6 +929,10 @@
#define wxUSE_CTL3D 1 #define wxUSE_CTL3D 1
#endif #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 // 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 // wxMiniFrame. This setting is only used for Win3.1; Win9x and NT use native
// miniframes support instead. // miniframes support instead.

View File

@@ -919,10 +919,6 @@
// Set to 1 to use font metric files in GetTextExtent // Set to 1 to use font metric files in GetTextExtent
#define wxUSE_AFM_FOR_POSTSCRIPT 0 #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 // database classes
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@@ -1034,6 +1030,10 @@
// Recommended setting: 1 // Recommended setting: 1
#define wxUSE_OLE 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 // 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 // wxMiniFrame. This setting is only used for Win3.1; Win9x and NT use native
// miniframes support instead. // miniframes support instead.

View File

@@ -914,10 +914,6 @@
// Set to 1 to use font metric files in GetTextExtent // Set to 1 to use font metric files in GetTextExtent
#define wxUSE_AFM_FOR_POSTSCRIPT 0 #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 // database classes
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@@ -1029,6 +1025,10 @@
// Recommended setting: 1 // Recommended setting: 1
#define wxUSE_OLE 0 #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 // 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 // wxMiniFrame. This setting is only used for Win3.1; Win9x and NT use native
// miniframes support instead. // miniframes support instead.

View File

@@ -932,10 +932,6 @@
// Set to 1 to use font metric files in GetTextExtent // Set to 1 to use font metric files in GetTextExtent
#define wxUSE_AFM_FOR_POSTSCRIPT 1 #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 // database classes
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------

View File

@@ -995,14 +995,6 @@
// Set to 1 to use font metric files in GetTextExtent // Set to 1 to use font metric files in GetTextExtent
#define wxUSE_AFM_FOR_POSTSCRIPT 1 #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 // database classes
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@@ -1117,6 +1109,14 @@
// Recommended setting: 1 for WIN32 // Recommended setting: 1 for WIN32
#define wxUSE_OLE 1 #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 // 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 // wxMiniFrame. This setting is only used for Win3.1; Win9x and NT use native
// miniframes support instead. // miniframes support instead.

View File

@@ -161,12 +161,7 @@
#define wxUSE_DEBUG_NEW_ALWAYS 0 #define wxUSE_DEBUG_NEW_ALWAYS 0
#if defined(_MSC_VER) || \
(defined(__BORLANDC__) && __BORLANDC__ >= 0x0550)
#define wxUSE_ON_FATAL_EXCEPTION 0 #define wxUSE_ON_FATAL_EXCEPTION 0
#else
#define wxUSE_ON_FATAL_EXCEPTION 0
#endif
#define wxUSE_STACKWALKER 0 #define wxUSE_STACKWALKER 0
@@ -449,8 +444,6 @@
#define wxUSE_AFM_FOR_POSTSCRIPT 0 #define wxUSE_AFM_FOR_POSTSCRIPT 0
#define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 0
#define wxUSE_ODBC 0 #define wxUSE_ODBC 0
@@ -968,6 +961,10 @@
with wx/msw/setup.h */ with wx/msw/setup.h */
#define wxUSE_XPM_IN_MSW wxUSE_XPM #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__ */ #endif /* __WIN32__ */
/* --------------------------------------------------------* /* --------------------------------------------------------*