make it possible to use wxToolBarSimple as wxToolBar with wxUniv

[wxWidgets.git] / src / mac / morefile / Optim.h

diff --git a/src/mac/morefile/Optim.h b/src/mac/morefile/Optim.h
index d09caf71c0a1084db474911bc64486da3eb80618..ff5a1d5d5732458fc0e0198a07e9d160f87d97dd 100644 (file)
--- a/src/mac/morefile/Optim.h
+++ b/src/mac/morefile/Optim.h
@@ -52,40 +52,69 @@
 **     File:   Optimization.h
 */
 
 **     File:   Optimization.h
 */
 

+#if TARGET_CARBON

 
 

-#ifndef __MACOSSEVENFIVEONEORLATER
-       #define __MACOSSEVENFIVEONEORLATER 0
-#endif
-
-#ifndef __MACOSSEVENFIVEORLATER
-       #define __MACOSSEVENFIVEORLATER __MACOSSEVENFIVEONEORLATER
-#endif
-
-#ifndef __MACOSSEVENORLATER
-       #if GENERATINGCFM
-               #define __MACOSSEVENORLATER 1
-       #else
-               #define __MACOSSEVENORLATER __MACOSSEVENFIVEORLATER
+       #define __MACOSSEVENFIVEONEORLATER 1
+       
+       #define __MACOSSEVENORLATER 1   
+       
+       #ifndef __WANTPASCALELIMINATION
+               #define __WANTPASCALELIMINATION 0

        #endif
        #endif

-#endif
-
-
-#ifndef        __WANTPASCALELIMINATION
-       #define __WANTPASCALELIMINATION 0
-#endif
-
-#if    __WANTPASCALELIMINATION
-       #define pascal  
-#endif
-
+       
+       #if     __WANTPASCALELIMINATION
+               #define pascal  
+       #endif
+       
+       
+       #ifndef __USEPRAGMAINTERNAL
+               #define __USEPRAGMAINTERNAL     0
+       #endif
+       
+       #if     __USEPRAGMAINTERNAL
+               #if defined(__MWERKS__)
+                       #pragma internal on
+               #endif
+       #endif
+#else

 
 

-#ifndef __USEPRAGMAINTERNAL
-       #define __USEPRAGMAINTERNAL     0
-#endif
+       // we have a basic requirements of 7.5.3 Rev 2 or 7.6
+       
+       #define __MACOSSEVENFIVEONEORLATER 1

 
 

-#if    __USEPRAGMAINTERNAL
-       #if defined(__MWERKS__)
-               #pragma internal on
+       #ifndef __MACOSSEVENFIVEONEORLATER
+               #define __MACOSSEVENFIVEONEORLATER 0
+       #endif
+       
+       #ifndef __MACOSSEVENFIVEORLATER
+               #define __MACOSSEVENFIVEORLATER __MACOSSEVENFIVEONEORLATER
+       #endif
+       
+       #ifndef __MACOSSEVENORLATER
+               #if GENERATINGCFM
+                       #define __MACOSSEVENORLATER 1
+               #else
+                       #define __MACOSSEVENORLATER __MACOSSEVENFIVEORLATER
+               #endif
+       #endif
+       
+       
+       #ifndef __WANTPASCALELIMINATION
+               #define __WANTPASCALELIMINATION 0
+       #endif
+       
+       #if     __WANTPASCALELIMINATION
+               #define pascal  
+       #endif
+       
+       
+       #ifndef __USEPRAGMAINTERNAL
+               #define __USEPRAGMAINTERNAL     0
+       #endif
+       
+       #if     __USEPRAGMAINTERNAL
+               #if defined(__MWERKS__)
+                       #pragma internal on
+               #endif

        #endif
 #endif
        #endif
 #endif

-