From cda6fc01ba80a7a0cd159d10ccaeaea6573bf41b Mon Sep 17 00:00:00 2001
From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Tue, 19 Apr 2005 10:06:30 +0000
Subject: [PATCH] fixing CW 8 builds for all targets

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33744 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/wx_cwc.h        | 16 ++++++++--------
 include/wx/wxshlb_cw.h     | 32 ++++++++++++++++----------------
 include/wx/wxshlb_cw_d.h   | 16 ++++++++--------
 include/wx/wxshlb_cwc.h    | 20 ++++++++++----------
 include/wx/wxshlb_cwc_d.h  |  8 ++++----
 include/wx/wxshlba_cw.h    | 32 ++++++++++++++++----------------
 include/wx/wxshlba_cw_d.h  | 16 ++++++++--------
 include/wx/wxshlba_cwc.h   | 12 ++++++------
 include/wx/wxshlba_cwc_d.h |  8 ++++----
 include/wxshlb_cwc.pch     |  6 +++---
 include/wxshlb_cwc.pch++   |  6 +++---
 11 files changed, 86 insertions(+), 86 deletions(-)

diff --git a/include/wx/wx_cwc.h b/include/wx/wx_cwc.h
index c1fa2c6b54..18007f921f 100644
--- a/include/wx/wx_cwc.h
+++ b/include/wx/wx_cwc.h
@@ -19,29 +19,29 @@
 #if __option(profile)
 #ifdef __cplusplus
     #ifdef __MACH__
-        #include <wx_Mach++_prof.mch>
+        #include "wx_Mach++_prof.mch"
     #elif __POWERPC__
-        #include <wx_Carbon++_prof.mch>
+        #include "wx_Carbon++_prof.mch"
     #endif
 #else
     #ifdef __MACH__
-        #include <wx_Mach_prof.mch>
+        #include "wx_Mach_prof.mch"
     #elif __POWERPC__
-        #include <wx_Carbon_prof.mch>
+        #include "wx_Carbon_prof.mch"
     #endif
 #endif
 #else
 #ifdef __cplusplus
     #ifdef __MACH__
-        #include <wx_Mach++.mch>
+        #include "wx_Mach++.mch"
     #elif __POWERPC__
-        #include <wx_Carbon++.mch>
+        #include "wx_Carbon++.mch"
     #endif
 #else
     #ifdef __MACH__
-        #include <wx_Mach.mch>
+        #include "wx_Mach.mch"
     #elif __POWERPC__
-        #include <wx_Carbon.mch>
+        #include "wx_Carbon.mch"
     #endif
 #endif
 #endif
diff --git a/include/wx/wxshlb_cw.h b/include/wx/wxshlb_cw.h
index 5c5f09f013..8929cd51dd 100644
--- a/include/wx/wxshlb_cw.h
+++ b/include/wx/wxshlb_cw.h
@@ -19,45 +19,45 @@
 #if __option(profile)
 #ifdef __cplusplus
     #if __POWERPC__
-        #include <wxshlb_PPC++_prof.mch>
+        #include "wxshlb_PPC++_prof.mch"
     #elif __INTEL__
-        #include <wxshlb_x86++_prof.mch>
+        #include "wxshlb_x86++_prof.mch"
     #elif __CFM68K__
-        #include <wxshlb_cfm++_prof.mch>
+        #include "wxshlb_cfm++_prof.mch"
     #else
-        #include <wxshlb_68k++_prof.mch>
+        #include "wxshlb_68k++_prof.mch"
     #endif
 #else
     #if __POWERPC__
-        #include <wxshlb_PPC_prof.mch>
+        #include "wxshlb_PPC_prof.mch"
     #elif __INTEL__
-        #include <wxshlb_x86_prof.mch>
+        #include "wxshlb_x86_prof.mch"
     #elif __CFM68K__
-        #include <wxshlb_cfm_prof.mch>
+        #include "wxshlb_cfm_prof.mch"
     #else
-        #include <wxshlb_68k_prof.mch>
+        #include "wxshlb_68k_prof.mch"
     #endif
 #endif
 #else
 #ifdef __cplusplus
     #if __POWERPC__
-        #include <wxshlb_PPC++.mch>
+        #include "wxshlb_PPC++.mch"
     #elif __INTEL__
-        #include <wxshlb_x86++.mch>
+        #include "wxshlb_x86++.mch"
     #elif __CFM68K__
-        #include <wxshlb_cfm++.mch>
+        #include "wxshlb_cfm++.mch"
     #else
-        #include <wxshlb_68k++.mch>
+        #include "wxshlb_68k++.mch"
     #endif
 #else
     #if __POWERPC__
-        #include <wxshlb_PPC.mch>
+        #include "wxshlb_PPC.mch"
     #elif __INTEL__
-        #include <wxshlb_x86.mch>
+        #include "wxshlb_x86.mch"
     #elif __CFM68K__
-        #include <wxshlb_cfm.mch>
+        #include "wxshlb_cfm.mch"
     #else
-        #include <wxshlb_68k.mch>
+        #include "wxshlb_68k.mch"
     #endif
 #endif
 #endif
diff --git a/include/wx/wxshlb_cw_d.h b/include/wx/wxshlb_cw_d.h
index 00525468a3..1bfce4de5b 100644
--- a/include/wx/wxshlb_cw_d.h
+++ b/include/wx/wxshlb_cw_d.h
@@ -21,23 +21,23 @@
 #else
 #ifdef __cplusplus
     #if __POWERPC__
-        #include <wxshlb_PPC++_d.mch>
+        #include "wxshlb_PPC++_d.mch"
     #elif __INTEL__
-        #include <wxshlb_x86++_d.mch>
+        #include "wxshlb_x86++_d.mch"
     #elif __CFM68K__
-        #include <wxshlb_cfm++_d.mch>
+        #include "wxshlb_cfm++_d.mch"
     #else
-        #include <wxshlb_68k++_d.mch>
+        #include "wxshlb_68k++_d.mch"
     #endif
 #else
     #if __POWERPC__
-        #include <wxshlb_PPC_d.mch>
+        #include "wxshlb_PPC_d.mch"
     #elif __INTEL__
-        #include <wxshlb_x86_d.mch>
+        #include "wxshlb_x86_d.mch"
     #elif __CFM68K__
-        #include <wxshlb_cfm_d.mch>
+        #include "wxshlb_cfm_d.mch"
     #else
-        #include <wxshlb_68k_d.mch>
+        #include "wxshlb_68k_d.mch"
     #endif
 #endif
 #endif
diff --git a/include/wx/wxshlb_cwc.h b/include/wx/wxshlb_cwc.h
index bca57e303a..fa1f1cdeb6 100644
--- a/include/wx/wxshlb_cwc.h
+++ b/include/wx/wxshlb_cwc.h
@@ -19,25 +19,25 @@
 #if __option(profile)
 #ifdef __cplusplus
     #if __POWERPC__
-        #include <wxshlb_Carbon++_prof.mch>
+        #include "wxshlb_Carbon++_prof.mch"
     #endif
 #else
     #if __POWERPC__
-        #include <wxshlb_Carbon_prof.mch>
+        #include "wxshlb_Carbon_prof.mch"
     #endif
 #endif
 #else
 #ifdef __cplusplus
-    #if __POWERPC__
-        #include <wxshlb_Carbon++.mch>
-    #elif __MACH__
-        #include <wxshlb_Mach++.mch>
+    #if __MACH__
+        #include "wxshlb_Mach++.mch"
+    #elif __POWERPC__
+        #include "wxshlb_Carbon++.mch"
     #endif
 #else
-    #if __POWERPC__
-        #include <wxshlb_Carbon.mch>
-    #elif __MACH__
-        #include <wxshlb_Mach.mch>
+    #if __MACH__
+        #include "wxshlb_Mach.mch"
+    #elif __POWERPC__
+        #include "wxshlb_Carbon.mch"
     #endif
 #endif
 #endif
diff --git a/include/wx/wxshlb_cwc_d.h b/include/wx/wxshlb_cwc_d.h
index c82665c99f..cefa8690e7 100644
--- a/include/wx/wxshlb_cwc_d.h
+++ b/include/wx/wxshlb_cwc_d.h
@@ -21,15 +21,15 @@
 #else
 #ifdef __cplusplus
     #ifdef __MACH__
-        #include <wxshlb_Mach++_d.mch>
+        #include "wxshlb_Mach++_d.mch"
     #elif __POWERPC__
-        #include <wxshlb_Carbon++_d.mch>
+        #include "wxshlb_Carbon++_d.mch"
     #endif
 #else
     #ifdef __MACH__
-        #include <wxshlb_Mach_d.mch>
+        #include "wxshlb_Mach_d.mch"
     #elif __POWERPC__
-        #include <wxshlb_Carbon_d.mch>
+        #include "wxshlb_Carbon_d.mch"
     #endif
 #endif
 #endif
diff --git a/include/wx/wxshlba_cw.h b/include/wx/wxshlba_cw.h
index 806606975d..cdef0340ca 100644
--- a/include/wx/wxshlba_cw.h
+++ b/include/wx/wxshlba_cw.h
@@ -19,45 +19,45 @@
 #if __option(profile)
 #ifdef __cplusplus
     #if __POWERPC__
-        #include <wxshlba_PPC++_prof.mch>
+        #include "wxshlba_PPC++_prof.mch"
     #elif __INTEL__
-        #include <wxshlba_x86++_prof.mch>
+        #include "wxshlba_x86++_prof.mch"
     #elif __CFM68K__
-        #include <wxshlba_cfm++_prof.mch>
+        #include "wxshlba_cfm++_prof.mch"
     #else
-        #include <wxshlba_68k++_prof.mch>
+        #include "wxshlba_68k++_prof.mch"
     #endif
 #else
     #if __POWERPC__
-        #include <wxshlba_PPC_prof.mch>
+        #include "wxshlba_PPC_prof.mch"
     #elif __INTEL__
-        #include <wxshlba_x86_prof.mch>
+        #include "wxshlba_x86_prof.mch"
     #elif __CFM68K__
-        #include <wxshlba_cfm_prof.mch>
+        #include "wxshlba_cfm_prof.mch"
     #else
-        #include <wxshlba_68k_prof.mch>
+        #include "wxshlba_68k_prof.mch"
     #endif
 #endif
 #else
 #ifdef __cplusplus
     #if __POWERPC__
-        #include <wxshlba_PPC++.mch>
+        #include "wxshlba_PPC++.mch"
     #elif __INTEL__
-        #include <wxshlba_x86++.mch>
+        #include "wxshlba_x86++.mch"
     #elif __CFM68K__
-        #include <wxshlba_cfm++.mch>
+        #include "wxshlba_cfm++.mch"
     #else
-        #include <wxshlba_68k++.mch>
+        #include "wxshlba_68k++.mch"
     #endif
 #else
     #if __POWERPC__
-        #include <wxshlba_PPC.mch>
+        #include "wxshlba_PPC.mch"
     #elif __INTEL__
-        #include <wxshlba_x86.mch>
+        #include "wxshlba_x86.mch"
     #elif __CFM68K__
-        #include <wxshlba_cfm.mch>
+        #include "wxshlba_cfm.mch"
     #else
-        #include <wxshlba_68k.mch>
+        #include "wxshlba_68k.mch"
     #endif
 #endif
 #endif
diff --git a/include/wx/wxshlba_cw_d.h b/include/wx/wxshlba_cw_d.h
index 6dc6b17ee2..13ba33ff2e 100644
--- a/include/wx/wxshlba_cw_d.h
+++ b/include/wx/wxshlba_cw_d.h
@@ -21,23 +21,23 @@
 #else
 #ifdef __cplusplus
     #if __POWERPC__
-        #include <wxshlba_PPC++_d.mch>
+        #include "wxshlba_PPC++_d.mch"
     #elif __INTEL__
-        #include <wxshlba_x86++_d.mch>
+        #include "wxshlba_x86++_d.mch"
     #elif __CFM68K__
-        #include <wxshlba_cfm++_d.mch>
+        #include "wxshlba_cfm++_d.mch"
     #else
-        #include <wxshlba_68k++_d.mch>
+        #include "wxshlba_68k++_d.mch"
     #endif
 #else
     #if __POWERPC__
-        #include <wxshlba_PPC_d.mch>
+        #include "wxshlba_PPC_d.mch"
     #elif __INTEL__
-        #include <wxshlba_x86_d.mch>
+        #include "wxshlba_x86_d.mch"
     #elif __CFM68K__
-        #include <wxshlba_cfm_d.mch>
+        #include "wxshlba_cfm_d.mch"
     #else
-        #include <wxshlba_68k_d.mch>
+        #include "wxshlba_68k_d.mch"
     #endif
 #endif
 #endif
diff --git a/include/wx/wxshlba_cwc.h b/include/wx/wxshlba_cwc.h
index 6a91d11c1a..32d97a6194 100644
--- a/include/wx/wxshlba_cwc.h
+++ b/include/wx/wxshlba_cwc.h
@@ -19,25 +19,25 @@
 #if __option(profile)
 #ifdef __cplusplus
     #if __POWERPC__
-        #include <wxshlba_Carbon++_prof.mch>
+        #include "wxshlba_Carbon++_prof.mch"
     #endif
 #else
     #if __POWERPC__
-        #include <wxshlba_Carbon_prof.mch>
+        #include "wxshlba_Carbon_prof.mch"
     #endif
 #endif
 #else
 #ifdef __cplusplus
     #ifdef __MACH__
-        #include <wxshlba_Mach++.mch>
+        #include "wxshlba_Mach++.mch"
     #elif __POWERPC__
-        #include <wxshlba_Carbon++.mch>
+        #include "wxshlba_Carbon++.mch"
     #endif
 #else
     #ifdef __MACH__
-        #include <wxshlba_Mach.mch>
+        #include "wxshlba_Mach.mch"
     #elif __POWERPC__
-        #include <wxshlba_Carbon.mch>
+        #include "wxshlba_Carbon.mch"
     #endif
 #endif
 #endif
diff --git a/include/wx/wxshlba_cwc_d.h b/include/wx/wxshlba_cwc_d.h
index 67c293e565..88fcc0c882 100644
--- a/include/wx/wxshlba_cwc_d.h
+++ b/include/wx/wxshlba_cwc_d.h
@@ -21,15 +21,15 @@
 #else
 #ifdef __cplusplus
     #ifdef __MACH__
-        #include <wxshlba_Mach++_d.mch>
+        #include "wxshlba_Mach++_d.mch"
     #elif __POWERPC__
-        #include <wxshlba_Carbon++_d.mch>
+        #include "wxshlba_Carbon++_d.mch"
     #endif
 #else
     #ifdef __MACH__
-        #include <wxshlba_Mach_d.mch>
+        #include "wxshlba_Mach_d.mch"
     #elif __POWERPC__
-        #include <wxshlba_Carbon_d.mch>
+        #include "wxshlba_Carbon_d.mch"
     #endif
 #endif
 #endif
diff --git a/include/wxshlb_cwc.pch b/include/wxshlb_cwc.pch
index e2cb2e8692..d1ce19d856 100644
--- a/include/wxshlb_cwc.pch
+++ b/include/wxshlb_cwc.pch
@@ -5,10 +5,10 @@
 	#error "illegal processor for carbon"
 #endif
 #else
-#if __POWERPC__
-	#pragma precompile_target "wxshlb_Carbon.mch"
-#elif __MACH__
+#if __MACH__
 	#pragma precompile_target "wxshlb_Mach.mch"
+#elif __POWERPC__
+	#pragma precompile_target "wxshlb_Carbon.mch"
 #else
 	#error "illegal processor for carbon"
 #endif
diff --git a/include/wxshlb_cwc.pch++ b/include/wxshlb_cwc.pch++
index f108b20596..a0db910fe4 100644
--- a/include/wxshlb_cwc.pch++
+++ b/include/wxshlb_cwc.pch++
@@ -5,10 +5,10 @@
 	#error "illegal processor for carbon"
 #endif
 #else
-#if __POWERPC__
-	#pragma precompile_target "wxshlb_Carbon++.mch"
-#elif __MACH__
+#if __MACH__
 	#pragma precompile_target "wxshlb_Mach++.mch"
+#elif __POWERPC__
+	#pragma precompile_target "wxshlb_Carbon++.mch"
 #else
 	#error "illegal processor for carbon"
 #endif
-- 
2.47.2