All relevant toolbox modules have now been carbonized.

diff --git a/Mac/Build/PythonStandCarbon.prj b/Mac/Build/PythonStandCarbon.prj
index ae6d94561ccccfd2c41a5fa34a714d71928a50f6..b63f87dfc704de7a26a917850cc05401ff1539e7 100644 (file)
Binary files a/Mac/Build/PythonStandCarbon.prj and b/Mac/Build/PythonStandCarbon.prj differ

diff --git a/Mac/Lib/lib-toolbox/Appearance.py b/Mac/Lib/lib-toolbox/Appearance.py
index d9c4edadb47bdcf8a4b1ac24f795da1f86c85c44..818c003b49ebb149a70cf91a9c97d457e0b593d2 100644 (file)
--- a/Mac/Lib/lib-toolbox/Appearance.py
+++ b/Mac/Lib/lib-toolbox/Appearance.py
@@ -1,4 +1,4 @@
-# Generated from 'flap:CodeWarrior Pro 5:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:Appearance.h'
+# Generated from 'Macintosh HD:SWDev:Codewarrior Pro 5:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:Appearance.h'
 
 def FOUR_CHAR_CODE(x): return x
 _AppearanceDispatch = 0xAA74

diff --git a/Mac/Lib/lib-toolbox/Components.py b/Mac/Lib/lib-toolbox/Components.py
index 293b6436f5d240c30e1d51d8620d5bfe6def40b9..8a82d0182bfe2ab82c6535b5653318cc078e4afb 100644 (file)
--- a/Mac/Lib/lib-toolbox/Components.py
+++ b/Mac/Lib/lib-toolbox/Components.py
@@ -1,4 +1,4 @@
-# Generated from 'flap:CodeWarrior Pro 5:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:Components.h'
+# Generated from 'Macintosh HD:SWDev:Codewarrior Pro 5:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:Components.h'
 
 def FOUR_CHAR_CODE(x): return x
 kAppleManufacturer = FOUR_CHAR_CODE('appl')

diff --git a/Mac/Lib/lib-toolbox/Dragconst.py b/Mac/Lib/lib-toolbox/Dragconst.py
index d8f5675bc9a29d355b6dcb734ed5ab0f6a025e85..4d672dc595a1fd91eb67913f03f470b50e8af060 100644 (file)
--- a/Mac/Lib/lib-toolbox/Dragconst.py
+++ b/Mac/Lib/lib-toolbox/Dragconst.py
@@ -1,4 +1,4 @@
-# Generated from 'flap:CodeWarrior Pro 5:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:Drag.h'
+# Generated from 'Macintosh HD:SWDev:Codewarrior Pro 5:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:Drag.h'
 
 def FOUR_CHAR_CODE(x): return x
 from TextEdit import *

diff --git a/Mac/Lib/lib-toolbox/Fonts.py b/Mac/Lib/lib-toolbox/Fonts.py
index da239ccb9258c31603a84adc31d13136b333f4eb..5bd62b11e72817fd23368847721613ad8b1161d5 100644 (file)
--- a/Mac/Lib/lib-toolbox/Fonts.py
+++ b/Mac/Lib/lib-toolbox/Fonts.py
@@ -1,4 +1,4 @@
-# Generated from 'flap:CodeWarrior Pro 5:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:Fonts.h'
+# Generated from 'Macintosh HD:SWDev:Codewarrior Pro 5:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:Fonts.h'
 
 systemFont = 0
 applFont = 1

diff --git a/Mac/Lib/lib-toolbox/Icons.py b/Mac/Lib/lib-toolbox/Icons.py
index 21b79e5745d566ff6a1d2c6178939eda65d18ff1..d5bc265ae97176ab7ab47a214f29ea727f151ba5 100644 (file)
--- a/Mac/Lib/lib-toolbox/Icons.py
+++ b/Mac/Lib/lib-toolbox/Icons.py
@@ -1,4 +1,4 @@
-# Generated from 'flap:CodeWarrior Pro 5:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:Icons.h'
+# Generated from 'Macintosh HD:SWDev:Codewarrior Pro 5:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:Icons.h'
 
 def FOUR_CHAR_CODE(x): return x
 kGenericDocumentIconResource = -4000

diff --git a/Mac/Lib/lib-toolbox/Lists.py b/Mac/Lib/lib-toolbox/Lists.py
index 966c4ce3712af84953d4e75a8ed1812aa96301d9..12acf602dda990396810503bd9feb15a69a06ecf 100644 (file)
--- a/Mac/Lib/lib-toolbox/Lists.py
+++ b/Mac/Lib/lib-toolbox/Lists.py
@@ -1,4 +1,4 @@
-# Generated from 'flap:CodeWarrior Pro 5:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:Lists.h'
+# Generated from 'Macintosh HD:SWDev:Codewarrior Pro 5:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:Lists.h'
 
 def FOUR_CHAR_CODE(x): return x
 listNotifyNothing = FOUR_CHAR_CODE('nada')

diff --git a/Mac/Lib/lib-toolbox/QDOffscreen.py b/Mac/Lib/lib-toolbox/QDOffscreen.py
index 1e2cd4ad966f56dd104b191bc8d40af4b26fd0cf..b60454278517c4734e5e368a1d1559598f732d06 100644 (file)
--- a/Mac/Lib/lib-toolbox/QDOffscreen.py
+++ b/Mac/Lib/lib-toolbox/QDOffscreen.py
@@ -1,4 +1,4 @@
-# Generated from 'flap:CodeWarrior Pro 5:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:QDOffscreen.h'
+# Generated from 'Macintosh HD:SWDev:Codewarrior Pro 5:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:QDOffscreen.h'
 
 def FOUR_CHAR_CODE(x): return x
 pixPurgeBit = 0

diff --git a/Mac/Lib/lib-toolbox/QuickTime.py b/Mac/Lib/lib-toolbox/QuickTime.py
index a2762bc8b07fedb47175f61564605bd8b3265f41..9c2423149e6f07b76dc170418f0e13546cc567c5 100644 (file)
--- a/Mac/Lib/lib-toolbox/QuickTime.py
+++ b/Mac/Lib/lib-toolbox/QuickTime.py
@@ -1,4 +1,4 @@
-# Generated from 'flap:CodeWarrior Pro 5:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:Movies.h'
+# Generated from 'Macintosh HD:SWDev:Codewarrior Pro 5:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:Movies.h'
 
 def FOUR_CHAR_CODE(x): return x
 MovieFileType = FOUR_CHAR_CODE('MooV')

diff --git a/Mac/Lib/lib-toolbox/Sound.py b/Mac/Lib/lib-toolbox/Sound.py
index c49be40ed08f8e5f9d39fa96e184dabce2f5d12f..fed7e444c25552330182e59f424eea4fc7f8c0b0 100644 (file)
--- a/Mac/Lib/lib-toolbox/Sound.py
+++ b/Mac/Lib/lib-toolbox/Sound.py
@@ -1,4 +1,4 @@
-# Generated from 'flap:CodeWarrior Pro 5:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:Sound.h'
+# Generated from 'Macintosh HD:SWDev:Codewarrior Pro 5:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:Sound.h'
 
 def FOUR_CHAR_CODE(x): return x
 soundListRsrc = FOUR_CHAR_CODE('snd ')

diff --git a/Mac/Lib/lib-toolbox/TextEdit.py b/Mac/Lib/lib-toolbox/TextEdit.py
index 41b1223e7f2fba65d67aabaf70d0c0666af1078f..315452aca8a8f297cf5969012bcca14b3f81483a 100644 (file)
--- a/Mac/Lib/lib-toolbox/TextEdit.py
+++ b/Mac/Lib/lib-toolbox/TextEdit.py
@@ -1,4 +1,4 @@
-# Generated from 'flap:CodeWarrior Pro 5:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:TextEdit.h'
+# Generated from 'Macintosh HD:SWDev:Codewarrior Pro 5:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:TextEdit.h'
 
 teJustLeft = 0
 teJustCenter = 1

diff --git a/Mac/Modules/cm/Cmmodule.c b/Mac/Modules/cm/Cmmodule.c
index ab293d9da38216aa87049e8d2b6253eebf4e8e26..de00241906a5599a2c73f1fb36d9645c98cfd452 100644 (file)
--- a/Mac/Modules/cm/Cmmodule.c
+++ b/Mac/Modules/cm/Cmmodule.c
@@ -192,6 +192,8 @@ static PyObject *CmpInstObj_SetComponentInstanceStorage(_self, _args)
        return _res;
 }
 
+#ifndef TARGET_API_MAC_CARBON
+
 static PyObject *CmpInstObj_GetComponentInstanceA5(_self, _args)
        ComponentInstanceObject *_self;
        PyObject *_args;
@@ -205,6 +207,9 @@ static PyObject *CmpInstObj_GetComponentInstanceA5(_self, _args)
                             _rv);
        return _res;
 }
+#endif
+
+#ifndef TARGET_API_MAC_CARBON
 
 static PyObject *CmpInstObj_SetComponentInstanceA5(_self, _args)
        ComponentInstanceObject *_self;
@@ -221,6 +226,7 @@ static PyObject *CmpInstObj_SetComponentInstanceA5(_self, _args)
        _res = Py_None;
        return _res;
 }
+#endif
 
 static PyObject *CmpInstObj_ComponentFunctionImplemented(_self, _args)
        ComponentInstanceObject *_self;
@@ -281,10 +287,16 @@ static PyMethodDef CmpInstObj_methods[] = {
         "() -> (Handle _rv)"},
        {"SetComponentInstanceStorage", (PyCFunction)CmpInstObj_SetComponentInstanceStorage, 1,
         "(Handle theStorage) -> None"},
+
+#ifndef TARGET_API_MAC_CARBON
        {"GetComponentInstanceA5", (PyCFunction)CmpInstObj_GetComponentInstanceA5, 1,
         "() -> (long _rv)"},
+#endif
+
+#ifndef TARGET_API_MAC_CARBON
        {"SetComponentInstanceA5", (PyCFunction)CmpInstObj_SetComponentInstanceA5, 1,
         "(long theA5) -> None"},
+#endif
        {"ComponentFunctionImplemented", (PyCFunction)CmpInstObj_ComponentFunctionImplemented, 1,
         "(short ftnNumber) -> (long _rv)"},
        {"GetComponentVersion", (PyCFunction)CmpInstObj_GetComponentVersion, 1,

diff --git a/Mac/Modules/cm/cmscan.py b/Mac/Modules/cm/cmscan.py
index e1db4b4d4be82b6db8374a96eac2fcc1b2123edb..6298f75f1e9a327712862c6c20855e459bfd21b7 100644 (file)
--- a/Mac/Modules/cm/cmscan.py
+++ b/Mac/Modules/cm/cmscan.py
@@ -58,6 +58,13 @@ class MyScanner(Scanner):
                        "OpenAComponent",
                        ]
 
+       def makegreylist(self):
+               return [
+                       ('#ifndef TARGET_API_MAC_CARBON', [
+                               'SetComponentInstanceA5',
+                               'GetComponentInstanceA5',
+                       ])]
+
        def makeblacklisttypes(self):
                return [
                        "ResourceSpec",

diff --git a/Mac/Modules/fm/Fmmodule.c b/Mac/Modules/fm/Fmmodule.c
index 1d84a31d52f8c75a06b3a5e14d782279ab21a095..37d47e8a3dcb7434cc2c28fe1b4e1920916e0149 100644 (file)
--- a/Mac/Modules/fm/Fmmodule.c
+++ b/Mac/Modules/fm/Fmmodule.c
@@ -77,6 +77,8 @@ FMRec_Convert(v, p_itself)
 
 static PyObject *Fm_Error;
 
+#ifndef TARGET_API_MAC_CARBON
+
 static PyObject *Fm_InitFonts(_self, _args)
        PyObject *_self;
        PyObject *_args;
@@ -89,6 +91,7 @@ static PyObject *Fm_InitFonts(_self, _args)
        _res = Py_None;
        return _res;
 }
+#endif
 
 static PyObject *Fm_GetFontName(_self, _args)
        PyObject *_self;
@@ -143,6 +146,8 @@ static PyObject *Fm_RealFont(_self, _args)
        return _res;
 }
 
+#ifndef TARGET_API_MAC_CARBON
+
 static PyObject *Fm_SetFontLock(_self, _args)
        PyObject *_self;
        PyObject *_args;
@@ -157,6 +162,7 @@ static PyObject *Fm_SetFontLock(_self, _args)
        _res = Py_None;
        return _res;
 }
+#endif
 
 static PyObject *Fm_SetFScaleDisable(_self, _args)
        PyObject *_self;
@@ -293,6 +299,8 @@ static PyObject *Fm_GetPreserveGlyph(_self, _args)
        return _res;
 }
 
+#ifndef TARGET_API_MAC_CARBON
+
 static PyObject *Fm_FlushFonts(_self, _args)
        PyObject *_self;
        PyObject *_args;
@@ -307,6 +315,7 @@ static PyObject *Fm_FlushFonts(_self, _args)
        _res = Py_None;
        return _res;
 }
+#endif
 
 static PyObject *Fm_GetSysFont(_self, _args)
        PyObject *_self;
@@ -373,16 +382,22 @@ static PyObject *Fm_IsAntiAliasedTextEnabled(_self, _args)
 }
 
 static PyMethodDef Fm_methods[] = {
+
+#ifndef TARGET_API_MAC_CARBON
        {"InitFonts", (PyCFunction)Fm_InitFonts, 1,
         "() -> None"},
+#endif
        {"GetFontName", (PyCFunction)Fm_GetFontName, 1,
         "(short familyID) -> (Str255 name)"},
        {"GetFNum", (PyCFunction)Fm_GetFNum, 1,
         "(Str255 name) -> (short familyID)"},
        {"RealFont", (PyCFunction)Fm_RealFont, 1,
         "(short fontNum, short size) -> (Boolean _rv)"},
+
+#ifndef TARGET_API_MAC_CARBON
        {"SetFontLock", (PyCFunction)Fm_SetFontLock, 1,
         "(Boolean lockFlag) -> None"},
+#endif
        {"SetFScaleDisable", (PyCFunction)Fm_SetFScaleDisable, 1,
         "(Boolean fscaleDisable) -> None"},
        {"FontMetrics", (PyCFunction)Fm_FontMetrics, 1,
@@ -401,8 +416,11 @@ static PyMethodDef Fm_methods[] = {
         "(Boolean preserveGlyph) -> None"},
        {"GetPreserveGlyph", (PyCFunction)Fm_GetPreserveGlyph, 1,
         "() -> (Boolean _rv)"},
+
+#ifndef TARGET_API_MAC_CARBON
        {"FlushFonts", (PyCFunction)Fm_FlushFonts, 1,
         "() -> None"},
+#endif
        {"GetSysFont", (PyCFunction)Fm_GetSysFont, 1,
         "() -> (short _rv)"},
        {"GetAppFont", (PyCFunction)Fm_GetAppFont, 1,

diff --git a/Mac/Modules/fm/fmscan.py b/Mac/Modules/fm/fmscan.py
index b06e9cb9133cc09e062a4e23f022cc375fa45604..3539b6d5f80c175eaad41a8a5b22a6bc41173fa5 100644 (file)
--- a/Mac/Modules/fm/fmscan.py
+++ b/Mac/Modules/fm/fmscan.py
@@ -38,6 +38,13 @@ class MyScanner(Scanner):
                        "AntiTextSetApplicationAware",
                        ]
 
+       def makegreylist(self):
+               return [
+                       ('#ifndef TARGET_API_MAC_CARBON', [
+                               'InitFonts',
+                               'SetFontLock',
+                               'FlushFonts',
+                       ])]
        def makeblacklisttypes(self):
                return [
                        "FMInput_ptr",  # Not needed for now

diff --git a/Mac/Modules/icn/Icnmodule.c b/Mac/Modules/icn/Icnmodule.c
index 9420d3787f9584a7695aad4933480f16db8224fc..dfa54d61e8e01f6ba5536e030b1e3968e8dd0638 100644 (file)
--- a/Mac/Modules/icn/Icnmodule.c
+++ b/Mac/Modules/icn/Icnmodule.c
@@ -604,6 +604,8 @@ static PyObject *Icn_PlotCIconHandle(_self, _args)
        return _res;
 }
 
+#ifndef TARGET_API_MAC_CARBON
+
 static PyObject *Icn_IconServicesTerminate(_self, _args)
        PyObject *_self;
        PyObject *_args;
@@ -616,6 +618,7 @@ static PyObject *Icn_IconServicesTerminate(_self, _args)
        _res = Py_None;
        return _res;
 }
+#endif
 
 static PyObject *Icn_IconRefToIconFamily(_self, _args)
        PyObject *_self;
@@ -1336,8 +1339,11 @@ static PyMethodDef Icn_methods[] = {
         "(Rect theRect, IconAlignmentType align, IconTransformType transform, Handle theSICN) -> None"},
        {"PlotCIconHandle", (PyCFunction)Icn_PlotCIconHandle, 1,
         "(Rect theRect, IconAlignmentType align, IconTransformType transform, CIconHandle theCIcon) -> None"},
+
+#ifndef TARGET_API_MAC_CARBON
        {"IconServicesTerminate", (PyCFunction)Icn_IconServicesTerminate, 1,
         "() -> None"},
+#endif
        {"IconRefToIconFamily", (PyCFunction)Icn_IconRefToIconFamily, 1,
         "(IconRef theIconRef, IconSelectorValue whichIcons) -> (IconFamilyHandle iconFamily)"},
        {"IconFamilyToIconSuite", (PyCFunction)Icn_IconFamilyToIconSuite, 1,

diff --git a/Mac/Modules/icn/icnscan.py b/Mac/Modules/icn/icnscan.py
index ee5a269e60b33164c469724d89c7122da526f8e8..c2af061f66f24d7a32b828266c7468d42b359bae 100644 (file)
--- a/Mac/Modules/icn/icnscan.py
+++ b/Mac/Modules/icn/icnscan.py
@@ -45,6 +45,12 @@ class MyScanner(Scanner):
                        "svAllAvailableData",
                        ]
 
+       def makegreylist(self):
+               return [
+                       ('#ifndef TARGET_API_MAC_CARBON', [
+                               'IconServicesTerminate',
+                       ])]
+
        def makeblacklisttypes(self):
                return [
                        "IconActionUPP",

diff --git a/Mac/Modules/macconfig.c b/Mac/Modules/macconfig.c
index 74f7c15627a83fc36b8c4c74c8b4db9acc0b8fc8..88d75df8f3035f0e5964940e1aaabb0347a0d722 100644 (file)
--- a/Mac/Modules/macconfig.c
+++ b/Mac/Modules/macconfig.c
@@ -223,7 +223,10 @@ struct _inittab _PyImport_Inittab[] = {
        {"List", initList},
        {"Snd", initSnd},
        {"Sndihooks", initSndihooks},
+#ifndef TARGET_API_MAC_CARBON_NOTYET
+       /* Carbon scrap manager is completely different */
        {"Scrap", initScrap},
+#endif
        {"TE", initTE},
        {"ColorPicker", initColorPicker},
 #ifndef TARGET_API_MAC_CARBON

diff --git a/Mac/Modules/qt/Qtmodule.c b/Mac/Modules/qt/Qtmodule.c
index a03286e49a6d81415d1d21732b6c0f11d68c2479..f382f9fe624d639d89f31c4c193ff8b23099ea25 100644 (file)
--- a/Mac/Modules/qt/Qtmodule.c
+++ b/Mac/Modules/qt/Qtmodule.c
@@ -6235,6 +6235,8 @@ PyTypeObject Movie_Type = {
 /* --------------------- End object type Movie ---------------------- */
 
 
+#ifndef TARGET_API_MAC_CARBON
+
 static PyObject *Qt_CheckQuickTimeRegistration(_self, _args)
        PyObject *_self;
        PyObject *_args;
@@ -6252,6 +6254,7 @@ static PyObject *Qt_CheckQuickTimeRegistration(_self, _args)
        _res = Py_None;
        return _res;
 }
+#endif
 
 static PyObject *Qt_EnterMovies(_self, _args)
        PyObject *_self;
@@ -7625,6 +7628,8 @@ static PyObject *Qt_SpriteMediaGetActionVariable(_self, _args)
        return _res;
 }
 
+#ifndef TARGET_API_MAC_CARBON
+
 static PyObject *Qt_SpriteMediaGetIndImageProperty(_self, _args)
        PyObject *_self;
        PyObject *_args;
@@ -7649,6 +7654,7 @@ static PyObject *Qt_SpriteMediaGetIndImageProperty(_self, _args)
                             _rv);
        return _res;
 }
+#endif
 
 static PyObject *Qt_NewTimeBase(_self, _args)
        PyObject *_self;
@@ -7818,8 +7824,11 @@ static PyObject *Qt_MoviesTask(_self, _args)
 }
 
 static PyMethodDef Qt_methods[] = {
+
+#ifndef TARGET_API_MAC_CARBON
        {"CheckQuickTimeRegistration", (PyCFunction)Qt_CheckQuickTimeRegistration, 1,
         "(void * registrationKey, long flags) -> None"},
+#endif
        {"EnterMovies", (PyCFunction)Qt_EnterMovies, 1,
         "() -> None"},
        {"ExitMovies", (PyCFunction)Qt_ExitMovies, 1,
@@ -7940,8 +7949,11 @@ static PyMethodDef Qt_methods[] = {
         "(MediaHandler mh, QTAtomID variableID, float value) -> (ComponentResult _rv)"},
        {"SpriteMediaGetActionVariable", (PyCFunction)Qt_SpriteMediaGetActionVariable, 1,
         "(MediaHandler mh, QTAtomID variableID) -> (ComponentResult _rv, float value)"},
+
+#ifndef TARGET_API_MAC_CARBON
        {"SpriteMediaGetIndImageProperty", (PyCFunction)Qt_SpriteMediaGetIndImageProperty, 1,
         "(MediaHandler mh, short imageIndex, long imagePropertyType, void * imagePropertyValue) -> (ComponentResult _rv)"},
+#endif
        {"NewTimeBase", (PyCFunction)Qt_NewTimeBase, 1,
         "() -> (TimeBase _rv)"},
        {"ConvertTime", (PyCFunction)Qt_ConvertTime, 1,

diff --git a/Mac/Modules/qt/qtscan.py b/Mac/Modules/qt/qtscan.py
index 5f351950e22bc5120d86002e3793eff360109c89..d57a32d60d1d310212775a3506b3836995a9222b 100644 (file)
--- a/Mac/Modules/qt/qtscan.py
+++ b/Mac/Modules/qt/qtscan.py
@@ -63,6 +63,13 @@ class MyScanner(Scanner):
 ##                     "VideoMediaGetStallCount", # Undefined in CW Pro 3 library
                        ]
 
+       def makegreylist(self):
+               return [
+                       ('#ifndef TARGET_API_MAC_CARBON', [
+                               'SpriteMediaGetIndImageProperty',       # XXXX Why isn't this in carbon?
+                               'CheckQuickTimeRegistration',
+                       ])]
+
        def makeblacklisttypes(self):
                return [
                        # I don't think we want to do these

diff --git a/Mac/Modules/snd/Sndmodule.c b/Mac/Modules/snd/Sndmodule.c
index 019fa256d1510bc1eb53ad4d114c2b576439744a..b045baf0968ee05382ecba1249b78131026ecab8 100644 (file)
--- a/Mac/Modules/snd/Sndmodule.c
+++ b/Mac/Modules/snd/Sndmodule.c
@@ -188,6 +188,8 @@ static PyObject *SndCh_SndPlay(_self, _args)
        return _res;
 }
 
+#ifndef TARGET_API_MAC_CARBON
+
 static PyObject *SndCh_SndStartFilePlay(_self, _args)
        SndChannelObject *_self;
        PyObject *_args;
@@ -217,6 +219,9 @@ static PyObject *SndCh_SndStartFilePlay(_self, _args)
        _res = Py_None;
        return _res;
 }
+#endif
+
+#ifndef TARGET_API_MAC_CARBON
 
 static PyObject *SndCh_SndPauseFilePlay(_self, _args)
        SndChannelObject *_self;
@@ -232,6 +237,9 @@ static PyObject *SndCh_SndPauseFilePlay(_self, _args)
        _res = Py_None;
        return _res;
 }
+#endif
+
+#ifndef TARGET_API_MAC_CARBON
 
 static PyObject *SndCh_SndStopFilePlay(_self, _args)
        SndChannelObject *_self;
@@ -250,6 +258,7 @@ static PyObject *SndCh_SndStopFilePlay(_self, _args)
        _res = Py_None;
        return _res;
 }
+#endif
 
 static PyObject *SndCh_SndChannelStatus(_self, _args)
        SndChannelObject *_self;
@@ -321,12 +330,21 @@ static PyMethodDef SndCh_methods[] = {
         "(SndCommand cmd) -> None"},
        {"SndPlay", (PyCFunction)SndCh_SndPlay, 1,
         "(SndListHandle sndHandle, Boolean async) -> None"},
+
+#ifndef TARGET_API_MAC_CARBON
        {"SndStartFilePlay", (PyCFunction)SndCh_SndStartFilePlay, 1,
         "(short fRefNum, short resNum, long bufferSize, Boolean async) -> None"},
+#endif
+
+#ifndef TARGET_API_MAC_CARBON
        {"SndPauseFilePlay", (PyCFunction)SndCh_SndPauseFilePlay, 1,
         "() -> None"},
+#endif
+
+#ifndef TARGET_API_MAC_CARBON
        {"SndStopFilePlay", (PyCFunction)SndCh_SndStopFilePlay, 1,
         "(Boolean quietNow) -> None"},
+#endif
        {"SndChannelStatus", (PyCFunction)SndCh_SndChannelStatus, 1,
         "(short theLength) -> (SCStatus theStatus)"},
        {"SndGetInfo", (PyCFunction)SndCh_SndGetInfo, 1,
@@ -471,11 +489,13 @@ static int SPBObj_setattr(self, name, value)
                        self->ob_completion = value;
                        Py_INCREF(value);
                        rv = 1;
+#ifndef TARGET_API_MAC_CARBON_NOTYET
                } else if (strcmp(name, "interruptRoutine") == 0) {
                        self->ob_spb.completionRoutine = NewSIInterruptProc(SPB_interrupt);
                        self->ob_interrupt = value;
                        Py_INCREF(value);
                        rv = 1;
+#endif
                }
                if ( rv ) return 0;
                else return -1;
@@ -570,6 +590,8 @@ static PyObject *Snd_SndNewChannel(_self, _args)
        return _res;
 }
 
+#ifndef TARGET_API_MAC_CARBON
+
 static PyObject *Snd_SndControl(_self, _args)
        PyObject *_self;
        PyObject *_args;
@@ -588,6 +610,7 @@ static PyObject *Snd_SndControl(_self, _args)
                             SndCmd_New, &cmd);
        return _res;
 }
+#endif
 
 static PyObject *Snd_SndSoundManagerVersion(_self, _args)
        PyObject *_self;
@@ -654,6 +677,8 @@ static PyObject *Snd_SndSetSysBeepState(_self, _args)
        return _res;
 }
 
+#ifndef TARGET_API_MAC_CARBON
+
 static PyObject *Snd_MACEVersion(_self, _args)
        PyObject *_self;
        PyObject *_args;
@@ -667,6 +692,9 @@ static PyObject *Snd_MACEVersion(_self, _args)
                             PyMac_BuildNumVersion, _rv);
        return _res;
 }
+#endif
+
+#ifndef TARGET_API_MAC_CARBON
 
 static PyObject *Snd_Comp3to1(_self, _args)
        PyObject *_self;
@@ -711,6 +739,9 @@ static PyObject *Snd_Comp3to1(_self, _args)
  buffer__error__: ;
        return _res;
 }
+#endif
+
+#ifndef TARGET_API_MAC_CARBON
 
 static PyObject *Snd_Exp1to3(_self, _args)
        PyObject *_self;
@@ -755,6 +786,9 @@ static PyObject *Snd_Exp1to3(_self, _args)
  buffer__error__: ;
        return _res;
 }
+#endif
+
+#ifndef TARGET_API_MAC_CARBON
 
 static PyObject *Snd_Comp6to1(_self, _args)
        PyObject *_self;
@@ -799,6 +833,9 @@ static PyObject *Snd_Comp6to1(_self, _args)
  buffer__error__: ;
        return _res;
 }
+#endif
+
+#ifndef TARGET_API_MAC_CARBON
 
 static PyObject *Snd_Exp1to6(_self, _args)
        PyObject *_self;
@@ -843,6 +880,7 @@ static PyObject *Snd_Exp1to6(_self, _args)
  buffer__error__: ;
        return _res;
 }
+#endif
 
 static PyObject *Snd_GetSysBeepVolume(_self, _args)
        PyObject *_self;
@@ -1153,6 +1191,8 @@ static PyObject *Snd_SPBRecord(_self, _args)
        return _res;
 }
 
+#ifndef TARGET_API_MAC_CARBON
+
 static PyObject *Snd_SPBRecordToFile(_self, _args)
        PyObject *_self;
        PyObject *_args;
@@ -1175,6 +1215,7 @@ static PyObject *Snd_SPBRecordToFile(_self, _args)
        _res = Py_None;
        return _res;
 }
+#endif
 
 static PyObject *Snd_SPBPauseRecording(_self, _args)
        PyObject *_self;
@@ -1352,8 +1393,11 @@ static PyMethodDef Snd_methods[] = {
         "(short duration) -> None"},
        {"SndNewChannel", (PyCFunction)Snd_SndNewChannel, 1,
         "(short synth, long init, PyObject* userRoutine) -> (SndChannelPtr chan)"},
+
+#ifndef TARGET_API_MAC_CARBON
        {"SndControl", (PyCFunction)Snd_SndControl, 1,
         "(short id) -> (SndCommand cmd)"},
+#endif
        {"SndSoundManagerVersion", (PyCFunction)Snd_SndSoundManagerVersion, 1,
         "() -> (NumVersion _rv)"},
        {"SndManagerStatus", (PyCFunction)Snd_SndManagerStatus, 1,
@@ -1362,16 +1406,31 @@ static PyMethodDef Snd_methods[] = {
         "() -> (short sysBeepState)"},
        {"SndSetSysBeepState", (PyCFunction)Snd_SndSetSysBeepState, 1,
         "(short sysBeepState) -> None"},
+
+#ifndef TARGET_API_MAC_CARBON
        {"MACEVersion", (PyCFunction)Snd_MACEVersion, 1,
         "() -> (NumVersion _rv)"},
+#endif
+
+#ifndef TARGET_API_MAC_CARBON
        {"Comp3to1", (PyCFunction)Snd_Comp3to1, 1,
         "(Buffer buffer, StateBlock state, unsigned long numChannels, unsigned long whichChannel) -> (Buffer buffer, StateBlock state)"},
+#endif
+
+#ifndef TARGET_API_MAC_CARBON
        {"Exp1to3", (PyCFunction)Snd_Exp1to3, 1,
         "(Buffer buffer, StateBlock state, unsigned long numChannels, unsigned long whichChannel) -> (Buffer buffer, StateBlock state)"},
+#endif
+
+#ifndef TARGET_API_MAC_CARBON
        {"Comp6to1", (PyCFunction)Snd_Comp6to1, 1,
         "(Buffer buffer, StateBlock state, unsigned long numChannels, unsigned long whichChannel) -> (Buffer buffer, StateBlock state)"},
+#endif
+
+#ifndef TARGET_API_MAC_CARBON
        {"Exp1to6", (PyCFunction)Snd_Exp1to6, 1,
         "(Buffer buffer, StateBlock state, unsigned long numChannels, unsigned long whichChannel) -> (Buffer buffer, StateBlock state)"},
+#endif
        {"GetSysBeepVolume", (PyCFunction)Snd_GetSysBeepVolume, 1,
         "() -> (long level)"},
        {"SetSysBeepVolume", (PyCFunction)Snd_SetSysBeepVolume, 1,
@@ -1404,8 +1463,11 @@ static PyMethodDef Snd_methods[] = {
         "(long inRefNum) -> None"},
        {"SPBRecord", (PyCFunction)Snd_SPBRecord, 1,
         "(SPBPtr inParamPtr, Boolean asynchFlag) -> None"},
+
+#ifndef TARGET_API_MAC_CARBON
        {"SPBRecordToFile", (PyCFunction)Snd_SPBRecordToFile, 1,
         "(short fRefNum, SPBPtr inParamPtr, Boolean asynchFlag) -> None"},
+#endif
        {"SPBPauseRecording", (PyCFunction)Snd_SPBPauseRecording, 1,
         "(long inRefNum) -> None"},
        {"SPBResumeRecording", (PyCFunction)Snd_SPBResumeRecording, 1,

diff --git a/Mac/Modules/snd/sndscan.py b/Mac/Modules/snd/sndscan.py
index a190bfe1bbaa2c3ea4fde80c460e28d4dff51d7e..c4f494f005fb5c977fd4b441733ae3ae19e18330 100644 (file)
--- a/Mac/Modules/snd/sndscan.py
+++ b/Mac/Modules/snd/sndscan.py
@@ -62,6 +62,21 @@ class SoundScanner(Scanner):
 
                        ]
 
+       def makegreylist(self):
+               return [
+                       ('#ifndef TARGET_API_MAC_CARBON', [
+                               'MACEVersion',
+                               'SPBRecordToFile',
+                               'Exp1to6',
+                               'Comp6to1',
+                               'Exp1to3',
+                               'Comp3to1',
+                               'SndControl',
+                               'SndStopFilePlay',
+                               'SndStartFilePlay',
+                               'SndPauseFilePlay',
+                       ])]
+
        def makeblacklisttypes(self):
                return [
                        "GetSoundVol",

diff --git a/Mac/Modules/snd/sndsupport.py b/Mac/Modules/snd/sndsupport.py
index 9856e79a1e85b6eefa0e78fa7fc3fa6317a3635d..d48a20701bdf41537eef730f739357aa439e1b41 100644 (file)
--- a/Mac/Modules/snd/sndsupport.py
+++ b/Mac/Modules/snd/sndsupport.py
@@ -315,11 +315,13 @@ class SpbObjectDefinition(ObjectDefinition):
                self->ob_completion = value;
                Py_INCREF(value);
                rv = 1;
+#ifndef TARGET_API_MAC_CARBON_NOTYET
        } else if (strcmp(name, "interruptRoutine") == 0) {
                self->ob_spb.completionRoutine = NewSIInterruptProc(SPB_interrupt);
                self->ob_interrupt = value;
                Py_INCREF(value);
                rv = 1;
+#endif
        }
        if ( rv ) return 0;
        else return -1;""")

diff --git a/Mac/Modules/win/Winmodule.c b/Mac/Modules/win/Winmodule.c
index a03d4933b6a3ce35d4eda73da063c5ca54fc0c2e..ffd8b0b62228d1fe8e5b5c9c4e3d642b15598162 100644 (file)
--- a/Mac/Modules/win/Winmodule.c
+++ b/Mac/Modules/win/Winmodule.c
@@ -2240,7 +2240,7 @@ static PyObject *Win_GetCWMgrPort(_self, _args)
 }
 #endif
 
-#ifndef TARGET_API_MAC_CARBON_NOTYET
+#ifndef TARGET_API_MAC_CARBON
 
 static PyObject *Win_IsValidWindowPtr(_self, _args)
        PyObject *_self;
@@ -2480,7 +2480,7 @@ static PyMethodDef Win_methods[] = {
         "() -> (CGrafPtr wMgrCPort)"},
 #endif
 
-#ifndef TARGET_API_MAC_CARBON_NOTYET
+#ifndef TARGET_API_MAC_CARBON
        {"IsValidWindowPtr", (PyCFunction)Win_IsValidWindowPtr, 1,
         "(GrafPtr grafPort) -> (Boolean _rv)"},
 #endif

diff --git a/Mac/Modules/win/winscan.py b/Mac/Modules/win/winscan.py
index b0f0fb3021919ba48dfc4f2537f2fbfae25a0b4b..a9686887701c7f2c9cdb55b7cdaa52793a93d237 100644 (file)
--- a/Mac/Modules/win/winscan.py
+++ b/Mac/Modules/win/winscan.py
@@ -63,9 +63,7 @@ class MyScanner(Scanner):
                                'ValidRect',
                                'InvalRgn',
                                'InvalRect',
-                       ]),
-                       ('#ifndef TARGET_API_MAC_CARBON_NOTYET', [
-                               'IsValidWindowPtr',
+                               'IsValidWindowPtr', # I think this is useless for Python, but not sure...
                        ])]
                        
        def makeblacklisttypes(self):