traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

The MacOS toolbox modules have acquired an _ in front of their name. Normal usage is through a wrapper module (without underscore) which lives in the Carbon package.

This commit is contained in:
Jack Jansen 2001-08-23 13:51:46 +00:00
parent 88e0b5bee0
commit 77105a960b
26 changed files with 178 additions and 172 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Mac/Include/macbuildno.h
View File

@ -1 +1 @@
#define BUILD 101 #define BUILD 104

4
Mac/Modules/ae/aesupport.py
View File

@ -164,7 +164,7 @@ initstuff = initstuff + """
PyMac_INIT_TOOLBOX_OBJECT_CONVERT(AEDesc, AEDesc_Convert); PyMac_INIT_TOOLBOX_OBJECT_CONVERT(AEDesc, AEDesc_Convert);
""" """
module = MacModule('AE', 'AE', includestuff, finalstuff, initstuff) module = MacModule('_AE', 'AE', includestuff, finalstuff, initstuff)
class AEDescDefinition(GlobalObjectDefinition): class AEDescDefinition(GlobalObjectDefinition):
@ -222,5 +222,5 @@ execfile('aegen.py')
for f in functions: module.add(f) for f in functions: module.add(f)
for f in aedescmethods: aedescobject.add(f) for f in aedescmethods: aedescobject.add(f)
SetOutputFileName('AEmodule.c') SetOutputFileName('_AEmodule.c')
module.generate() module.generate()

4
Mac/Modules/app/appsupport.py
View File

@ -7,12 +7,12 @@ import string
# Declarations that change for each manager # Declarations that change for each manager
MACHEADERFILE = 'Appearance.h' # The Apple header file MACHEADERFILE = 'Appearance.h' # The Apple header file
MODNAME = 'App' # The name of the module MODNAME = '_App' # The name of the module
OBJECTNAME = 'UNUSED' # The basic name of the objects used here OBJECTNAME = 'UNUSED' # The basic name of the objects used here
KIND = 'Record' # Usually 'Ptr' or 'Handle' KIND = 'Record' # Usually 'Ptr' or 'Handle'
# The following is *usually* unchanged but may still require tuning # The following is *usually* unchanged but may still require tuning
MODPREFIX = MODNAME # The prefix for module-wide routines MODPREFIX = 'App' # The prefix for module-wide routines
OBJECTTYPE = OBJECTNAME + KIND # The C type used to represent them OBJECTTYPE = OBJECTNAME + KIND # The C type used to represent them
OBJECTPREFIX = MODPREFIX + 'Obj' # The prefix for object methods OBJECTPREFIX = MODPREFIX + 'Obj' # The prefix for object methods
INPUTFILE = string.lower(MODPREFIX) + 'gen.py' # The file generated by the scanner INPUTFILE = string.lower(MODPREFIX) + 'gen.py' # The file generated by the scanner

4
Mac/Modules/cf/cfsupport.py
View File

@ -8,10 +8,10 @@
import string import string
# Declarations that change for each manager # Declarations that change for each manager
MODNAME = 'CF' # The name of the module MODNAME = '_CF' # The name of the module
# The following is *usually* unchanged but may still require tuning # The following is *usually* unchanged but may still require tuning
MODPREFIX = MODNAME # The prefix for module-wide routines MODPREFIX = 'CF' # The prefix for module-wide routines
INPUTFILE = string.lower(MODPREFIX) + 'gen.py' # The file generated by the scanner INPUTFILE = string.lower(MODPREFIX) + 'gen.py' # The file generated by the scanner
OUTPUTFILE = MODNAME + "module.c" # The file generated by this program OUTPUTFILE = MODNAME + "module.c" # The file generated by this program

4
Mac/Modules/cm/cmsupport.py
View File

@ -7,10 +7,10 @@ import string
# Declarations that change for each manager # Declarations that change for each manager
MACHEADERFILE = 'Components.h' # The Apple header file MACHEADERFILE = 'Components.h' # The Apple header file
MODNAME = 'Cm' # The name of the module MODNAME = '_Cm' # The name of the module
# The following is *usually* unchanged but may still require tuning # The following is *usually* unchanged but may still require tuning
MODPREFIX = MODNAME # The prefix for module-wide routines MODPREFIX = 'Cm' # The prefix for module-wide routines
C_OBJECTPREFIX = 'CmpObj' # The prefix for object methods C_OBJECTPREFIX = 'CmpObj' # The prefix for object methods
CI_OBJECTPREFIX = 'CmpInstObj' CI_OBJECTPREFIX = 'CmpInstObj'
INPUTFILE = string.lower(MODPREFIX) + 'gen.py' # The file generated by the scanner INPUTFILE = string.lower(MODPREFIX) + 'gen.py' # The file generated by the scanner

4
Mac/Modules/ctl/ctlsupport.py
View File

@ -7,11 +7,11 @@ import string
# Declarations that change for each manager # Declarations that change for each manager
MACHEADERFILE = 'Controls.h' # The Apple header file MACHEADERFILE = 'Controls.h' # The Apple header file
MODNAME = 'Ctl' # The name of the module MODNAME = '_Ctl' # The name of the module
OBJECTNAME = 'Control' # The basic name of the objects used here OBJECTNAME = 'Control' # The basic name of the objects used here
# The following is *usually* unchanged but may still require tuning # The following is *usually* unchanged but may still require tuning
MODPREFIX = MODNAME # The prefix for module-wide routines MODPREFIX = 'Ctl' # The prefix for module-wide routines
OBJECTTYPE = OBJECTNAME + 'Handle' # The C type used to represent them OBJECTTYPE = OBJECTNAME + 'Handle' # The C type used to represent them
OBJECTPREFIX = MODPREFIX + 'Obj' # The prefix for object methods OBJECTPREFIX = MODPREFIX + 'Obj' # The prefix for object methods
INPUTFILE = string.lower(MODPREFIX) + 'gen.py' # The file generated by the scanner INPUTFILE = string.lower(MODPREFIX) + 'gen.py' # The file generated by the scanner

4
Mac/Modules/dlg/dlgsupport.py
View File

@ -240,7 +240,7 @@ class MyObjectDefinition(GlobalObjectDefinition):
Output("DisposeDialog(%s);", itselfname) Output("DisposeDialog(%s);", itselfname)
# Create the generator groups and link them # Create the generator groups and link them
module = MacModule('Dlg', 'Dlg', includestuff, finalstuff, initstuff) module = MacModule('_Dlg', 'Dlg', includestuff, finalstuff, initstuff)
object = MyObjectDefinition('Dialog', 'DlgObj', 'DialogPtr') object = MyObjectDefinition('Dialog', 'DlgObj', 'DialogPtr')
module.addobject(object) module.addobject(object)
@ -300,5 +300,5 @@ f = ManualGenerator("SetUserItemHandler", setuseritembody)
module.add(f) module.add(f)
# generate output # generate output
SetOutputFileName('Dlgmodule.c') SetOutputFileName('_Dlgmodule.c')
module.generate() module.generate()

4
Mac/Modules/drag/dragsupport.py
View File

@ -7,11 +7,11 @@ import string
# Declarations that change for each manager # Declarations that change for each manager
MACHEADERFILE = 'Drag.h' # The Apple header file MACHEADERFILE = 'Drag.h' # The Apple header file
MODNAME = 'Drag' # The name of the module MODNAME = '_Drag' # The name of the module
OBJECTNAME = 'DragObj' # The basic name of the objects used here OBJECTNAME = 'DragObj' # The basic name of the objects used here
# The following is *usually* unchanged but may still require tuning # The following is *usually* unchanged but may still require tuning
MODPREFIX = MODNAME # The prefix for module-wide routines MODPREFIX = 'Drag' # The prefix for module-wide routines
OBJECTTYPE = 'DragRef' # The C type used to represent them OBJECTTYPE = 'DragRef' # The C type used to represent them
OBJECTPREFIX = MODPREFIX + 'Obj' # The prefix for object methods OBJECTPREFIX = MODPREFIX + 'Obj' # The prefix for object methods
INPUTFILE = string.lower(MODPREFIX) + 'gen.py' # The file generated by the scanner INPUTFILE = string.lower(MODPREFIX) + 'gen.py' # The file generated by the scanner

4
Mac/Modules/evt/evtsupport.py
View File

@ -7,12 +7,12 @@ import string
# Declarations that change for each manager # Declarations that change for each manager
MACHEADERFILE = 'Events.h' # The Apple header file MACHEADERFILE = 'Events.h' # The Apple header file
MODNAME = 'Evt' # The name of the module MODNAME = '_Evt' # The name of the module
OBJECTNAME = 'Event' # The basic name of the objects used here OBJECTNAME = 'Event' # The basic name of the objects used here
KIND = 'Record' # Usually 'Ptr' or 'Handle' KIND = 'Record' # Usually 'Ptr' or 'Handle'
# The following is *usually* unchanged but may still require tuning # The following is *usually* unchanged but may still require tuning
MODPREFIX = MODNAME # The prefix for module-wide routines MODPREFIX = 'Evt' # The prefix for module-wide routines
OBJECTTYPE = OBJECTNAME + KIND # The C type used to represent them OBJECTTYPE = OBJECTNAME + KIND # The C type used to represent them
OBJECTPREFIX = MODPREFIX + 'Obj' # The prefix for object methods OBJECTPREFIX = MODPREFIX + 'Obj' # The prefix for object methods
INPUTFILE = string.lower(MODPREFIX) + 'gen.py' # The file generated by the scanner INPUTFILE = string.lower(MODPREFIX) + 'gen.py' # The file generated by the scanner

4
Mac/Modules/fm/fmsupport.py
View File

@ -7,10 +7,10 @@ import string
# Declarations that change for each manager # Declarations that change for each manager
MACHEADERFILE = 'Fonts.h' # The Apple header file MACHEADERFILE = 'Fonts.h' # The Apple header file
MODNAME = 'Fm' # The name of the module MODNAME = '_Fm' # The name of the module
# The following is *usually* unchanged but may still require tuning # The following is *usually* unchanged but may still require tuning
MODPREFIX = MODNAME # The prefix for module-wide routines MODPREFIX = 'Fm' # The prefix for module-wide routines
INPUTFILE = string.lower(MODPREFIX) + 'gen.py' # The file generated by the scanner INPUTFILE = string.lower(MODPREFIX) + 'gen.py' # The file generated by the scanner
OUTPUTFILE = MODNAME + "module.c" # The file generated by this program OUTPUTFILE = MODNAME + "module.c" # The file generated by this program

4
Mac/Modules/help/helpsupport.py
View File

@ -7,12 +7,12 @@ import string
# Declarations that change for each manager # Declarations that change for each manager
MACHEADERFILE = 'Balloons.h' # The Apple header file MACHEADERFILE = 'Balloons.h' # The Apple header file
MODNAME = 'Help' # The name of the module MODNAME = '_Help' # The name of the module
OBJECTNAME = 'UNUSED' # The basic name of the objects used here OBJECTNAME = 'UNUSED' # The basic name of the objects used here
KIND = 'Record' # Usually 'Ptr' or 'Handle' KIND = 'Record' # Usually 'Ptr' or 'Handle'
# The following is *usually* unchanged but may still require tuning # The following is *usually* unchanged but may still require tuning
MODPREFIX = MODNAME # The prefix for module-wide routines MODPREFIX = 'Help' # The prefix for module-wide routines
OBJECTTYPE = OBJECTNAME + KIND # The C type used to represent them OBJECTTYPE = OBJECTNAME + KIND # The C type used to represent them
OBJECTPREFIX = MODPREFIX + 'Obj' # The prefix for object methods OBJECTPREFIX = MODPREFIX + 'Obj' # The prefix for object methods
INPUTFILE = string.lower(MODPREFIX) + 'gen.py' # The file generated by the scanner INPUTFILE = string.lower(MODPREFIX) + 'gen.py' # The file generated by the scanner

4
Mac/Modules/icn/icnsupport.py
View File

@ -7,12 +7,12 @@ import string
# Declarations that change for each manager # Declarations that change for each manager
MACHEADERFILE = 'Icons.h' # The Apple header file MACHEADERFILE = 'Icons.h' # The Apple header file
MODNAME = 'Icn' # The name of the module MODNAME = '_Icn' # The name of the module
OBJECTNAME = 'Icon' # The basic name of the objects used here OBJECTNAME = 'Icon' # The basic name of the objects used here
KIND = 'Handle' # Usually 'Ptr' or 'Handle' KIND = 'Handle' # Usually 'Ptr' or 'Handle'
# The following is *usually* unchanged but may still require tuning # The following is *usually* unchanged but may still require tuning
MODPREFIX = MODNAME # The prefix for module-wide routines MODPREFIX = 'Icn' # The prefix for module-wide routines
OBJECTTYPE = OBJECTNAME + KIND # The C type used to represent them OBJECTTYPE = OBJECTNAME + KIND # The C type used to represent them
OBJECTPREFIX = MODPREFIX + 'Obj' # The prefix for object methods OBJECTPREFIX = MODPREFIX + 'Obj' # The prefix for object methods
INPUTFILE = string.lower(MODPREFIX) + 'gen.py' # The file generated by the scanner INPUTFILE = string.lower(MODPREFIX) + 'gen.py' # The file generated by the scanner

4
Mac/Modules/list/listsupport.py
View File

@ -7,12 +7,12 @@ import string
# Declarations that change for each manager # Declarations that change for each manager
MACHEADERFILE = 'Lists.h' # The Apple header file MACHEADERFILE = 'Lists.h' # The Apple header file
MODNAME = 'List' # The name of the module MODNAME = '_List' # The name of the module
OBJECTNAME = 'List' # The basic name of the objects used here OBJECTNAME = 'List' # The basic name of the objects used here
KIND = 'Handle' # Usually 'Ptr' or 'Handle' KIND = 'Handle' # Usually 'Ptr' or 'Handle'
# The following is *usually* unchanged but may still require tuning # The following is *usually* unchanged but may still require tuning
MODPREFIX = MODNAME # The prefix for module-wide routines MODPREFIX = 'List' # The prefix for module-wide routines
OBJECTTYPE = "ListHandle" # The C type used to represent them OBJECTTYPE = "ListHandle" # The C type used to represent them
OBJECTPREFIX = MODPREFIX + 'Obj' # The prefix for object methods OBJECTPREFIX = MODPREFIX + 'Obj' # The prefix for object methods
INPUTFILE = string.lower(MODPREFIX) + 'gen.py' # The file generated by the scanner INPUTFILE = string.lower(MODPREFIX) + 'gen.py' # The file generated by the scanner

92
Mac/Modules/macconfig.c
View File

@ -94,35 +94,35 @@ extern void initicglue();
#ifndef USE_CORE_TOOLBOX #ifndef USE_CORE_TOOLBOX
#define USE_CORE_TOOLBOX #define USE_CORE_TOOLBOX
#endif #endif
extern void initApp(); extern void init_App();
extern void initFm(); extern void init_Fm();
extern void initHelp(); extern void init_Help();
extern void initIcn(); extern void init_Icn();
extern void initList(); extern void init_List();
extern void initMlte(); extern void init_Mlte();
extern void initQdoffs(); extern void init_Qdoffs();
extern void initSnd(); extern void init_Snd();
extern void initSndihooks(); extern void init_Sndihooks();
extern void initScrap(); extern void init_Scrap();
extern void initTE(); extern void init_TE();
extern void initColorPicker(); extern void initColorPicker();
extern void initPrinting(); extern void initPrinting();
extern void initCF(); extern void init_CF();
#endif #endif
#ifdef USE_CORE_TOOLBOX #ifdef USE_CORE_TOOLBOX
extern void initAE(); extern void init_AE();
extern void initCtl(); extern void init_Ctl();
extern void initDlg(); extern void init_Dlg();
extern void initDrag(); extern void init_Drag();
extern void initEvt(); extern void init_Evt();
extern void initMenu(); extern void init_Menu();
extern void initQd(); extern void init_Qd();
extern void initRes(); extern void init_Res();
extern void initWin(); extern void init_Win();
#endif #endif
#ifdef USE_QT #ifdef USE_QT
extern void initCm(); extern void init_Cm();
extern void initQt(); extern void init_Qt();
#endif #endif
#ifdef USE_IMG #ifdef USE_IMG
@ -217,40 +217,40 @@ struct _inittab _PyImport_Inittab[] = {
{"icglue", initicglue}, {"icglue", initicglue},
#endif #endif
#ifdef USE_CORE_TOOLBOX #ifdef USE_CORE_TOOLBOX
{"AE", initAE}, {"_AE", init_AE},
{"Ctl", initCtl}, {"_Ctl", init_Ctl},
{"Dlg", initDlg}, {"_Dlg", init_Dlg},
{"Drag", initDrag}, {"_Drag", init_Drag},
{"Evt", initEvt}, {"_Evt", init_Evt},
{"Menu", initMenu}, {"_Menu", init_Menu},
{"Qd", initQd}, {"_Qd", init_Qd},
{"Win", initWin}, {"_Win", init_Win},
{"Res", initRes}, {"_Res", init_Res},
#endif #endif
#ifdef USE_TOOLBOX #ifdef USE_TOOLBOX
{"App", initApp}, {"_App", init_App},
{"Fm", initFm}, {"_Fm", init_Fm},
{"Icn", initIcn}, {"_Icn", init_Icn},
{"List", initList}, {"_List", init_List},
{"Mlte", initMlte}, {"_Mlte", init_Mlte},
{"Qdoffs", initQdoffs}, {"_Qdoffs", init_Qdoffs},
{"Snd", initSnd}, {"_Snd", init_Snd},
{"Sndihooks", initSndihooks}, {"_Sndihooks", init_Sndihooks},
/* Carbon scrap manager is completely different */ /* Carbon scrap manager is completely different */
{"Scrap", initScrap}, {"_Scrap", init_Scrap},
{"TE", initTE}, {"_TE", init_TE},
{"ColorPicker", initColorPicker}, {"ColorPicker", initColorPicker},
#if !TARGET_API_MAC_CARBON #if !TARGET_API_MAC_CARBON
{"Help", initHelp}, {"_Help", init_Help},
{"Printing", initPrinting}, {"Printing", initPrinting},
#endif #endif
#if TARGET_API_MAC_CARBON #if TARGET_API_MAC_CARBON
{"CF", initCF}, {"_CF", init_CF},
#endif #endif
#endif #endif
#ifdef USE_QT #ifdef USE_QT
{"Cm", initCm}, {"_Cm", init_Cm},
{"Qt", initQt}, {"_Qt", init_Qt},
#endif #endif
#ifdef USE_IMG #ifdef USE_IMG
{"imgcolormap", initimgcolormap}, {"imgcolormap", initimgcolormap},

4
Mac/Modules/menu/menusupport.py
View File

@ -7,11 +7,11 @@ import string
# Declarations that change for each manager # Declarations that change for each manager
MACHEADERFILE = 'Menus.h' # The Apple header file MACHEADERFILE = 'Menus.h' # The Apple header file
MODNAME = 'Menu' # The name of the module MODNAME = '_Menu' # The name of the module
OBJECTNAME = 'Menu' # The basic name of the objects used here OBJECTNAME = 'Menu' # The basic name of the objects used here
# The following is *usually* unchanged but may still require tuning # The following is *usually* unchanged but may still require tuning
MODPREFIX = MODNAME # The prefix for module-wide routines MODPREFIX = 'Menu' # The prefix for module-wide routines
OBJECTTYPE = OBJECTNAME + 'Handle' # The C type used to represent them OBJECTTYPE = OBJECTNAME + 'Handle' # The C type used to represent them
OBJECTPREFIX = MODPREFIX + 'Obj' # The prefix for object methods OBJECTPREFIX = MODPREFIX + 'Obj' # The prefix for object methods
INPUTFILE = string.lower(MODPREFIX) + 'gen.py' # The file generated by the scanner INPUTFILE = string.lower(MODPREFIX) + 'gen.py' # The file generated by the scanner

4
Mac/Modules/mlte/mltesupport.py
View File

@ -8,10 +8,10 @@
import string import string
# Declarations that change for each manager # Declarations that change for each manager
MODNAME = 'Mlte' # The name of the module MODNAME = '_Mlte' # The name of the module
# The following is *usually* unchanged but may still require tuning # The following is *usually* unchanged but may still require tuning
MODPREFIX = MODNAME # The prefix for module-wide routines MODPREFIX = 'Mlte' # The prefix for module-wide routines
INPUTFILE = string.lower(MODPREFIX) + 'gen.py' # The file generated by the scanner INPUTFILE = string.lower(MODPREFIX) + 'gen.py' # The file generated by the scanner
OUTPUTFILE = MODNAME + "module.c" # The file generated by this program OUTPUTFILE = MODNAME + "module.c" # The file generated by this program

4
Mac/Modules/qd/qdsupport.py
View File

@ -7,11 +7,11 @@ import string
# Declarations that change for each manager # Declarations that change for each manager
MACHEADERFILE = 'QuickDraw.h' # The Apple header file MACHEADERFILE = 'QuickDraw.h' # The Apple header file
MODNAME = 'Qd' # The name of the module MODNAME = '_Qd' # The name of the module
OBJECTNAME = 'Graf' # The basic name of the objects used here OBJECTNAME = 'Graf' # The basic name of the objects used here
# The following is *usually* unchanged but may still require tuning # The following is *usually* unchanged but may still require tuning
MODPREFIX = MODNAME # The prefix for module-wide routines MODPREFIX = 'Qd' # The prefix for module-wide routines
OBJECTTYPE = OBJECTNAME + 'Ptr' # The C type used to represent them OBJECTTYPE = OBJECTNAME + 'Ptr' # The C type used to represent them
OBJECTPREFIX = MODPREFIX + 'Obj' # The prefix for object methods OBJECTPREFIX = MODPREFIX + 'Obj' # The prefix for object methods
INPUTFILE = string.lower(MODPREFIX) + 'gen.py' # The file generated by the scanner INPUTFILE = string.lower(MODPREFIX) + 'gen.py' # The file generated by the scanner

4
Mac/Modules/qdoffs/qdoffssupport.py
View File

@ -7,11 +7,11 @@ import string
# Declarations that change for each manager # Declarations that change for each manager
MACHEADERFILE = 'QDOffscreen.h' # The Apple header file MACHEADERFILE = 'QDOffscreen.h' # The Apple header file
MODNAME = 'Qdoffs' # The name of the module MODNAME = '_Qdoffs' # The name of the module
OBJECTNAME = 'GWorld' # The basic name of the objects used here OBJECTNAME = 'GWorld' # The basic name of the objects used here
# The following is *usually* unchanged but may still require tuning # The following is *usually* unchanged but may still require tuning
MODPREFIX = MODNAME # The prefix for module-wide routines MODPREFIX = 'Qdoffs' # The prefix for module-wide routines
OBJECTTYPE = OBJECTNAME + 'Ptr' # The C type used to represent them OBJECTTYPE = OBJECTNAME + 'Ptr' # The C type used to represent them
OBJECTPREFIX = OBJECTNAME + 'Obj' # The prefix for object methods OBJECTPREFIX = OBJECTNAME + 'Obj' # The prefix for object methods
INPUTFILE = string.lower(MODPREFIX) + 'gen.py' # The file generated by the scanner INPUTFILE = string.lower(MODPREFIX) + 'gen.py' # The file generated by the scanner

4
Mac/Modules/qt/qtsupport.py
View File

@ -9,11 +9,11 @@ import string
# Declarations that change for each manager # Declarations that change for each manager
MACHEADERFILE = 'Movies.h' # The Apple header file MACHEADERFILE = 'Movies.h' # The Apple header file
MODNAME = 'Qt' # The name of the module MODNAME = '_Qt' # The name of the module
OBJECTNAME = 'Movie' # The basic name of the objects used here OBJECTNAME = 'Movie' # The basic name of the objects used here
# The following is *usually* unchanged but may still require tuning # The following is *usually* unchanged but may still require tuning
MODPREFIX = MODNAME # The prefix for module-wide routines MODPREFIX = 'Qt' # The prefix for module-wide routines
OBJECTTYPE = "Movie" # The C type used to represent them OBJECTTYPE = "Movie" # The C type used to represent them
OBJECTPREFIX = MODPREFIX + 'Obj' # The prefix for object methods OBJECTPREFIX = MODPREFIX + 'Obj' # The prefix for object methods
INPUTFILE = string.lower(MODPREFIX) + 'gen.py' # The file generated by the scanner INPUTFILE = string.lower(MODPREFIX) + 'gen.py' # The file generated by the scanner

4
Mac/Modules/res/ressupport.py
View File

@ -93,7 +93,7 @@ initstuff = initstuff + """
PyMac_INIT_TOOLBOX_OBJECT_CONVERT(Handle, OptResObj_Convert); PyMac_INIT_TOOLBOX_OBJECT_CONVERT(Handle, OptResObj_Convert);
""" """
module = MacModule('Res', 'Res', includestuff, finalstuff, initstuff) module = MacModule('_Res', 'Res', includestuff, finalstuff, initstuff)
getattrHookCode = """ getattrHookCode = """
if (strcmp(name, "size") == 0) if (strcmp(name, "size") == 0)
@ -192,5 +192,5 @@ execfile('resedit.py')
for f in functions: module.add(f) for f in functions: module.add(f)
for f in resmethods: resobject.add(f) for f in resmethods: resobject.add(f)
SetOutputFileName('Resmodule.c') SetOutputFileName('_Resmodule.c')
module.generate() module.generate()

4
Mac/Modules/scrap/scrapsupport.py
View File

@ -10,10 +10,10 @@ import string
# Declarations that change for each manager # Declarations that change for each manager
MACHEADERFILE = 'Scrap.h' # The Apple header file MACHEADERFILE = 'Scrap.h' # The Apple header file
MODNAME = 'Scrap' # The name of the module MODNAME = '_Scrap' # The name of the module
# The following is *usually* unchanged but may still require tuning # The following is *usually* unchanged but may still require tuning
MODPREFIX = MODNAME # The prefix for module-wide routines MODPREFIX = 'Scrap' # The prefix for module-wide routines
INPUTFILE = string.lower(MODPREFIX) + 'gen.py' # The file generated by the scanner INPUTFILE = string.lower(MODPREFIX) + 'gen.py' # The file generated by the scanner
OUTPUTFILE = '@' + MODNAME + "module.c" # The file generated by this program OUTPUTFILE = '@' + MODNAME + "module.c" # The file generated by this program

4
Mac/Modules/snd/sndsupport.py
View File

@ -334,7 +334,7 @@ class SpbObjectDefinition(ObjectDefinition):
sndobject = SndObjectDefinition('SndChannel', 'SndCh', 'SndChannelPtr') sndobject = SndObjectDefinition('SndChannel', 'SndCh', 'SndChannelPtr')
spbobject = SpbObjectDefinition('SPB', 'SPBObj', 'SPBPtr') spbobject = SpbObjectDefinition('SPB', 'SPBObj', 'SPBPtr')
spbgenerator = ManualGenerator("SPB", "return SPBObj_New();") spbgenerator = ManualGenerator("SPB", "return SPBObj_New();")
module = MacModule('Snd', 'Snd', includestuff, finalstuff, initstuff) module = MacModule('_Snd', 'Snd', includestuff, finalstuff, initstuff)
module.addobject(sndobject) module.addobject(sndobject)
module.addobject(spbobject) module.addobject(spbobject)
module.add(spbgenerator) module.add(spbgenerator)
@ -359,5 +359,5 @@ for f in sndmethods: sndobject.add(f)
# generate output # generate output
SetOutputFileName('Sndmodule.c') SetOutputFileName('_Sndmodule.c')
module.generate() module.generate()

4
Mac/Modules/te/tesupport.py
View File

@ -7,12 +7,12 @@ import string
# Declarations that change for each manager # Declarations that change for each manager
MACHEADERFILE = 'TextEdit.h' # The Apple header file MACHEADERFILE = 'TextEdit.h' # The Apple header file
MODNAME = 'TE' # The name of the module MODNAME = '_TE' # The name of the module
OBJECTNAME = 'TE' # The basic name of the objects used here OBJECTNAME = 'TE' # The basic name of the objects used here
KIND = 'Handle' # Usually 'Ptr' or 'Handle' KIND = 'Handle' # Usually 'Ptr' or 'Handle'
# The following is *usually* unchanged but may still require tuning # The following is *usually* unchanged but may still require tuning
MODPREFIX = MODNAME # The prefix for module-wide routines MODPREFIX = 'TE' # The prefix for module-wide routines
OBJECTTYPE = "TEHandle" # The C type used to represent them OBJECTTYPE = "TEHandle" # The C type used to represent them
OBJECTPREFIX = MODPREFIX + 'Obj' # The prefix for object methods OBJECTPREFIX = MODPREFIX + 'Obj' # The prefix for object methods
INPUTFILE = string.lower(MODPREFIX) + 'gen.py' # The file generated by the scanner INPUTFILE = string.lower(MODPREFIX) + 'gen.py' # The file generated by the scanner

4
Mac/Modules/win/winsupport.py
View File

@ -7,11 +7,11 @@ import string
# Declarations that change for each manager # Declarations that change for each manager
MACHEADERFILE = 'Windows.h' # The Apple header file MACHEADERFILE = 'Windows.h' # The Apple header file
MODNAME = 'Win' # The name of the module MODNAME = '_Win' # The name of the module
OBJECTNAME = 'Window' # The basic name of the objects used here OBJECTNAME = 'Window' # The basic name of the objects used here
# The following is *usually* unchanged but may still require tuning # The following is *usually* unchanged but may still require tuning
MODPREFIX = MODNAME # The prefix for module-wide routines MODPREFIX = 'Win' # The prefix for module-wide routines
OBJECTTYPE = OBJECTNAME + 'Ptr' # The C type used to represent them OBJECTTYPE = OBJECTNAME + 'Ptr' # The C type used to represent them
OBJECTPREFIX = MODPREFIX + 'Obj' # The prefix for object methods OBJECTPREFIX = MODPREFIX + 'Obj' # The prefix for object methods
INPUTFILE = string.lower(MODPREFIX) + 'gen.py' # The file generated by the scanner INPUTFILE = string.lower(MODPREFIX) + 'gen.py' # The file generated by the scanner

88
Mac/scripts/fullbuild.py
View File

@ -250,28 +250,28 @@ I_PPC_PLUGINS : (buildmwproject, "CWIE", [
(":Extensions:Imaging:_tkinter.mcp", "_tkinter.ppc"), (":Extensions:Imaging:_tkinter.mcp", "_tkinter.ppc"),
(":Mac:Build:ColorPicker.mcp", "ColorPicker.ppc"), (":Mac:Build:ColorPicker.mcp", "ColorPicker.ppc"),
(":Mac:Build:Printing.mcp", "Printing.ppc"), (":Mac:Build:Printing.mcp", "Printing.ppc"),
(":Mac:Build:AE.mcp", "AE.ppc"), (":Mac:Build:_AE.mcp", "_AE.ppc"),
(":Mac:Build:App.mcp", "App.ppc"), (":Mac:Build:_App.mcp", "_App.ppc"),
(":Mac:Build:Cm.mcp", "Cm.ppc"), (":Mac:Build:_Cm.mcp", "_Cm.ppc"),
(":Mac:Build:Ctl.mcp", "Ctl.ppc"), (":Mac:Build:_Ctl.mcp", "_Ctl.ppc"),
(":Mac:Build:Dlg.mcp", "Dlg.ppc"), (":Mac:Build:_Dlg.mcp", "_Dlg.ppc"),
(":Mac:Build:Drag.mcp", "Drag.ppc"), (":Mac:Build:_Drag.mcp", "_Drag.ppc"),
(":Mac:Build:Evt.mcp", "Evt.ppc"), (":Mac:Build:_Evt.mcp", "_Evt.ppc"),
(":Mac:Build:Fm.mcp", "Fm.ppc"), (":Mac:Build:_Fm.mcp", "_Fm.ppc"),
(":Mac:Build:Help.mcp", "Help.ppc"), (":Mac:Build:_Help.mcp", "_Help.ppc"),
(":Mac:Build:Icn.mcp", "Icn.ppc"), (":Mac:Build:_Icn.mcp", "_Icn.ppc"),
(":Mac:Build:List.mcp", "List.ppc"), (":Mac:Build:_List.mcp", "_List.ppc"),
(":Mac:Build:Menu.mcp", "Menu.ppc"), (":Mac:Build:_Menu.mcp", "_Menu.ppc"),
(":Mac:Build:Mlte.mcp", "Mlte.ppc"), (":Mac:Build:_Mlte.mcp", "_Mlte.ppc"),
(":Mac:Build:Qd.mcp", "Qd.ppc"), (":Mac:Build:_Qd.mcp", "_Qd.ppc"),
(":Mac:Build:Qdoffs.mcp", "Qdoffs.ppc"), (":Mac:Build:_Qdoffs.mcp", "_Qdoffs.ppc"),
(":Mac:Build:Qt.mcp", "Qt.ppc"), (":Mac:Build:_Qt.mcp", "_Qt.ppc"),
(":Mac:Build:Res.mcp", "Res.ppc"), (":Mac:Build:_Res.mcp", "_Res.ppc"),
(":Mac:Build:Scrap.mcp", "Scrap.ppc"), (":Mac:Build:_Scrap.mcp", "_Scrap.ppc"),
(":Mac:Build:Snd.mcp", "Snd.ppc"), (":Mac:Build:_Snd.mcp", "_Snd.ppc"),
(":Mac:Build:Sndihooks.mcp", "Sndihooks.ppc"), (":Mac:Build:_Sndihooks.mcp", "_Sndihooks.ppc"),
(":Mac:Build:TE.mcp", "TE.ppc"), (":Mac:Build:_TE.mcp", "_TE.ppc"),
(":Mac:Build:Win.mcp", "Win.ppc"), (":Mac:Build:_Win.mcp", "_Win.ppc"),
]), ]),
I_CARBON_PLUGINS : (buildmwproject, "CWIE", [ I_CARBON_PLUGINS : (buildmwproject, "CWIE", [
@ -287,28 +287,28 @@ I_CARBON_PLUGINS : (buildmwproject, "CWIE", [
(":Mac:Build:_dummy_tkinter.mcp", "_tkinter.carbon"), (":Mac:Build:_dummy_tkinter.mcp", "_tkinter.carbon"),
## (":Extensions:Imaging:_tkinter.carbon.mcp", "_tkinter.carbon"), ## (":Extensions:Imaging:_tkinter.carbon.mcp", "_tkinter.carbon"),
(":Mac:Build:ColorPicker.carbon.mcp", "ColorPicker.carbon"), (":Mac:Build:ColorPicker.carbon.mcp", "ColorPicker.carbon"),
(":Mac:Build:AE.carbon.mcp", "AE.carbon"), (":Mac:Build:_AE.carbon.mcp", "_AE.carbon"),
(":Mac:Build:App.carbon.mcp", "App.carbon"), (":Mac:Build:_App.carbon.mcp", "_App.carbon"),
(":Mac:Build:CF.carbon.mcp", "CF.carbon"), (":Mac:Build:_CF.carbon.mcp", "_CF.carbon"),
(":Mac:Build:Cm.carbon.mcp", "Cm.carbon"), (":Mac:Build:_Cm.carbon.mcp", "_Cm.carbon"),
(":Mac:Build:Ctl.carbon.mcp", "Ctl.carbon"), (":Mac:Build:_Ctl.carbon.mcp", "_Ctl.carbon"),
(":Mac:Build:Dlg.carbon.mcp", "Dlg.carbon"), (":Mac:Build:_Dlg.carbon.mcp", "_Dlg.carbon"),
(":Mac:Build:Drag.carbon.mcp", "Drag.carbon"), (":Mac:Build:_Drag.carbon.mcp", "_Drag.carbon"),
(":Mac:Build:Evt.carbon.mcp", "Evt.carbon"), (":Mac:Build:_Evt.carbon.mcp", "_Evt.carbon"),
(":Mac:Build:Fm.carbon.mcp", "Fm.carbon"), (":Mac:Build:_Fm.carbon.mcp", "_Fm.carbon"),
(":Mac:Build:Icn.carbon.mcp", "Icn.carbon"), (":Mac:Build:_Icn.carbon.mcp", "_Icn.carbon"),
(":Mac:Build:List.carbon.mcp", "List.carbon"), (":Mac:Build:_List.carbon.mcp", "_List.carbon"),
(":Mac:Build:Menu.carbon.mcp", "Menu.carbon"), (":Mac:Build:_Menu.carbon.mcp", "_Menu.carbon"),
(":Mac:Build:Mlte.carbon.mcp", "Mlte.carbon"), (":Mac:Build:_Mlte.carbon.mcp", "_Mlte.carbon"),
(":Mac:Build:Qd.carbon.mcp", "Qd.carbon"), (":Mac:Build:_Qd.carbon.mcp", "_Qd.carbon"),
(":Mac:Build:Qdoffs.carbon.mcp", "Qdoffs.carbon"), (":Mac:Build:_Qdoffs.carbon.mcp", "_Qdoffs.carbon"),
(":Mac:Build:Qt.carbon.mcp", "Qt.carbon"), (":Mac:Build:_Qt.carbon.mcp", "_Qt.carbon"),
(":Mac:Build:Res.carbon.mcp", "Res.carbon"), (":Mac:Build:_Res.carbon.mcp", "_Res.carbon"),
(":Mac:Build:Scrap.carbon.mcp", "Scrap.carbon"), (":Mac:Build:_Scrap.carbon.mcp", "_Scrap.carbon"),
(":Mac:Build:Snd.carbon.mcp", "Snd.carbon"), (":Mac:Build:_Snd.carbon.mcp", "_Snd.carbon"),
(":Mac:Build:Sndihooks.carbon.mcp", "Sndihooks.carbon"), (":Mac:Build:_Sndihooks.carbon.mcp", "_Sndihooks.carbon"),
(":Mac:Build:TE.carbon.mcp", "TE.carbon"), (":Mac:Build:_TE.carbon.mcp", "_TE.carbon"),
(":Mac:Build:Win.carbon.mcp", "Win.carbon"), (":Mac:Build:_Win.carbon.mcp", "_Win.carbon"),
]), ]),

80
Mac/scripts/genpluginprojects.py
View File

@ -59,7 +59,13 @@ def genpluginproject(architecture, module,
if not sourcedirs: if not sourcedirs:
for moduledir in MODULEDIRS: for moduledir in MODULEDIRS:
if '%' in moduledir: if '%' in moduledir:
moduledir = moduledir % module # For historical reasons an initial _ in the modulename
# is not reflected in the folder name
if module[0] == '_':
modulewithout_ = module[1:]
else:
modulewithout_ = module
moduledir = moduledir % modulewithout_
fn = os.path.join(projectdir, os.path.join(moduledir, sources[0])) fn = os.path.join(projectdir, os.path.join(moduledir, sources[0]))
if os.path.exists(fn): if os.path.exists(fn):
moduledir, sourcefile = os.path.split(fn) moduledir, sourcefile = os.path.split(fn)
@ -106,47 +112,47 @@ def genallprojects(force=0):
genpluginproject("all", "_testcapi") genpluginproject("all", "_testcapi")
# bgen-generated Toolbox modules # bgen-generated Toolbox modules
genpluginproject("carbon", "AE", outputdir="::Lib:Carbon") genpluginproject("carbon", "_AE", outputdir="::Lib:Carbon")
genpluginproject("ppc", "AE", libraries=["ObjectSupportLib"], outputdir="::Lib:Carbon") genpluginproject("ppc", "_AE", libraries=["ObjectSupportLib"], outputdir="::Lib:Carbon")
genpluginproject("ppc", "App", libraries=["AppearanceLib"], outputdir="::Lib:Carbon") genpluginproject("ppc", "_App", libraries=["AppearanceLib"], outputdir="::Lib:Carbon")
genpluginproject("carbon", "App", outputdir="::Lib:Carbon") genpluginproject("carbon", "_App", outputdir="::Lib:Carbon")
genpluginproject("ppc", "Cm", libraries=["QuickTimeLib"], outputdir="::Lib:Carbon") genpluginproject("ppc", "_Cm", libraries=["QuickTimeLib"], outputdir="::Lib:Carbon")
genpluginproject("carbon", "Cm", outputdir="::Lib:Carbon") genpluginproject("carbon", "_Cm", outputdir="::Lib:Carbon")
genpluginproject("carbon", "Ctl", outputdir="::Lib:Carbon") genpluginproject("carbon", "_Ctl", outputdir="::Lib:Carbon")
genpluginproject("ppc", "Ctl", libraries=["ControlsLib", "AppearanceLib"], genpluginproject("ppc", "_Ctl", libraries=["ControlsLib", "AppearanceLib"],
outputdir="::Lib:Carbon") outputdir="::Lib:Carbon")
genpluginproject("carbon", "Dlg", outputdir="::Lib:Carbon") genpluginproject("carbon", "_Dlg", outputdir="::Lib:Carbon")
genpluginproject("ppc", "Dlg", libraries=["DialogsLib", "AppearanceLib"], genpluginproject("ppc", "_Dlg", libraries=["DialogsLib", "AppearanceLib"],
outputdir="::Lib:Carbon") outputdir="::Lib:Carbon")
genpluginproject("carbon", "Drag", outputdir="::Lib:Carbon") genpluginproject("carbon", "_Drag", outputdir="::Lib:Carbon")
genpluginproject("ppc", "Drag", libraries=["DragLib"], outputdir="::Lib:Carbon") genpluginproject("ppc", "_Drag", libraries=["DragLib"], outputdir="::Lib:Carbon")
genpluginproject("all", "Evt", outputdir="::Lib:Carbon") genpluginproject("all", "_Evt", outputdir="::Lib:Carbon")
genpluginproject("all", "Fm", outputdir="::Lib:Carbon") genpluginproject("all", "_Fm", outputdir="::Lib:Carbon")
genpluginproject("ppc", "Help", outputdir="::Lib:Carbon") genpluginproject("ppc", "_Help", outputdir="::Lib:Carbon")
genpluginproject("ppc", "Icn", libraries=["IconServicesLib"], outputdir="::Lib:Carbon") genpluginproject("ppc", "_Icn", libraries=["IconServicesLib"], outputdir="::Lib:Carbon")
genpluginproject("carbon", "Icn", outputdir="::Lib:Carbon") genpluginproject("carbon", "_Icn", outputdir="::Lib:Carbon")
genpluginproject("all", "List", outputdir="::Lib:Carbon") genpluginproject("all", "_List", outputdir="::Lib:Carbon")
genpluginproject("carbon", "Menu", outputdir="::Lib:Carbon") genpluginproject("carbon", "_Menu", outputdir="::Lib:Carbon")
genpluginproject("ppc", "Menu", libraries=["MenusLib", "ContextualMenu", "AppearanceLib"], genpluginproject("ppc", "_Menu", libraries=["MenusLib", "ContextualMenu", "AppearanceLib"],
outputdir="::Lib:Carbon") outputdir="::Lib:Carbon")
genpluginproject("all", "Qd", outputdir="::Lib:Carbon") genpluginproject("all", "_Qd", outputdir="::Lib:Carbon")
genpluginproject("ppc", "Qt", libraries=["QuickTimeLib"], outputdir="::Lib:Carbon") genpluginproject("ppc", "_Qt", libraries=["QuickTimeLib"], outputdir="::Lib:Carbon")
genpluginproject("carbon", "Qt", outputdir="::Lib:Carbon") genpluginproject("carbon", "_Qt", outputdir="::Lib:Carbon")
genpluginproject("all", "Qdoffs", outputdir="::Lib:Carbon") genpluginproject("all", "_Qdoffs", outputdir="::Lib:Carbon")
genpluginproject("all", "Res", outputdir="::Lib:Carbon") genpluginproject("all", "_Res", outputdir="::Lib:Carbon")
genpluginproject("all", "Scrap", outputdir="::Lib:Carbon") genpluginproject("all", "_Scrap", outputdir="::Lib:Carbon")
genpluginproject("ppc", "Snd", libraries=["SoundLib"], outputdir="::Lib:Carbon") genpluginproject("ppc", "_Snd", libraries=["SoundLib"], outputdir="::Lib:Carbon")
genpluginproject("carbon", "Snd", outputdir="::Lib:Carbon") genpluginproject("carbon", "_Snd", outputdir="::Lib:Carbon")
genpluginproject("all", "Sndihooks", sources=[":snd:Sndihooks.c"], outputdir="::Lib:Carbon") genpluginproject("all", "_Sndihooks", sources=[":snd:_Sndihooks.c"], outputdir="::Lib:Carbon")
genpluginproject("ppc", "TE", libraries=["DragLib"], outputdir="::Lib:Carbon") genpluginproject("ppc", "_TE", libraries=["DragLib"], outputdir="::Lib:Carbon")
genpluginproject("carbon", "TE", outputdir="::Lib:Carbon") genpluginproject("carbon", "_TE", outputdir="::Lib:Carbon")
genpluginproject("ppc", "Mlte", libraries=["Textension"], outputdir="::Lib:Carbon") genpluginproject("ppc", "_Mlte", libraries=["Textension"], outputdir="::Lib:Carbon")
genpluginproject("carbon", "Mlte", outputdir="::Lib:Carbon") genpluginproject("carbon", "_Mlte", outputdir="::Lib:Carbon")
genpluginproject("carbon", "Win", outputdir="::Lib:Carbon") genpluginproject("carbon", "_Win", outputdir="::Lib:Carbon")
genpluginproject("ppc", "Win", libraries=["WindowsLib", "AppearanceLib"], genpluginproject("ppc", "_Win", libraries=["WindowsLib", "AppearanceLib"],
outputdir="::Lib:Carbon") outputdir="::Lib:Carbon")
# Carbon Only? # Carbon Only?
genpluginproject("carbon", "CF", outputdir="::Lib:Carbon") genpluginproject("carbon", "_CF", outputdir="::Lib:Carbon")
# Other Mac modules # Other Mac modules
genpluginproject("all", "calldll", sources=["calldll.c"]) genpluginproject("all", "calldll", sources=["calldll.c"])