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

diff --git a/include/wx/mac/setup0.h b/include/wx/mac/setup0.h
index cb0d271e0c26da9e50a7a21f21f132020ac9189a..4feecf90c65fbef09ddab1dd6f782d3c803d8d87 100644 (file)
--- 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 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
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // database classes
 // ----------------------------------------------------------------------------

diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h
index fd814ff1c9788ba5557acb14b5a2b89a0ab3b3a7..10f096380ceb0cf0d89df9cd819bc849efcc89a7 100644 (file)
--- 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 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
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // database classes
 // ----------------------------------------------------------------------------


@@ -1074,6 +1070,10 @@
 // Set this to 1 to enable wxDIB
 #define wxUSE_WXDIB 1
 
 // 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.
 // 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 8f291d8ecd885822bebef8e203c3c3832b50de5f..5cd347c67c61c4ce596ac074b52a04faaaa076b6 100644 (file)
--- 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 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
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // database classes
 // ----------------------------------------------------------------------------


@@ -933,6 +929,10 @@
 #define wxUSE_CTL3D                      1
 #endif
 
 #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.
 // 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 53396dff91d2d00dccf2e255a5fbcf6c71b61bee..4c3a8483a182a0c98afc2e5011562e9a57c79b5a 100644 (file)
--- 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 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
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // database classes
 // ----------------------------------------------------------------------------


@@ -1034,6 +1030,10 @@
 // Recommended setting: 1
 #define wxUSE_OLE           1
 
 // 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.
 // 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 e124c1ab5637221a84450dae94ea72f2a153f54f..256b740294ee0eb49c48d0aafc9ac7f97164a01a 100644 (file)
--- 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 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
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // database classes
 // ----------------------------------------------------------------------------


@@ -1029,6 +1025,10 @@
 // Recommended setting: 1
 #define wxUSE_OLE           0
 
 // 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.
 // 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 d05c40db5f0095634e40e7f0efdfab43b998e8c4..91b4e5707cec485e45473543b1ac8ef8030633af 100644 (file)
--- 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 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
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // database classes
 // ----------------------------------------------------------------------------

diff --git a/include/wx/univ/setup0.h b/include/wx/univ/setup0.h
index 05078462042186f9da1f84430abd7a8309e387f9..9e8a8722f9e21ef1f78416e306f86fbe8ab069f4 100644 (file)
--- 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 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
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // database classes
 // ----------------------------------------------------------------------------


@@ -1117,6 +1109,14 @@
 // Recommended setting: 1 for WIN32
     #define wxUSE_OLE 1
 
 // 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.
 // 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 0d20029b85b41896b33ce32bced5e7ba2043879e..67270d612e87ed82248022e7e46f6a609e49bbc5 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -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
-#else
-    #define wxUSE_ON_FATAL_EXCEPTION 0
-#endif
+#define wxUSE_ON_FATAL_EXCEPTION 0

 
 #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 */
 #define wxUSE_XPM_IN_MSW wxUSE_XPM
 
    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__ */
 
 /* --------------------------------------------------------*
 #endif /* __WIN32__ */
 
 /* --------------------------------------------------------*