Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 77105a9

Browse files
jackjansenjackjansen
committed
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.
1 parent 88e0b5b commit 77105a9

26 files changed

Lines changed: 178 additions & 172 deletions

‎Mac/Include/macbuildno.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
#define BUILD 101
1+
#define BUILD 104

‎Mac/Modules/ae/aesupport.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ def passInput(self, name):
164164
PyMac_INIT_TOOLBOX_OBJECT_CONVERT(AEDesc, AEDesc_Convert);
165165
"""
166166

167-
module = MacModule('AE', 'AE', includestuff, finalstuff, initstuff)
167+
module = MacModule('_AE', 'AE', includestuff, finalstuff, initstuff)
168168

169169
class AEDescDefinition(GlobalObjectDefinition):
170170

@@ -222,5 +222,5 @@ def outputGetattrHook(self):
222222
for f in functions: module.add(f)
223223
for f in aedescmethods: aedescobject.add(f)
224224

225-
SetOutputFileName('AEmodule.c')
225+
SetOutputFileName('_AEmodule.c')
226226
module.generate()

‎Mac/Modules/app/appsupport.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77

88
# Declarations that change for each manager
99
MACHEADERFILE = 'Appearance.h' # The Apple header file
10-
MODNAME = 'App' # The name of the module
10+
MODNAME = '_App' # The name of the module
1111
OBJECTNAME = 'UNUSED' # The basic name of the objects used here
1212
KIND = 'Record' # Usually 'Ptr' or 'Handle'
1313

1414
# The following is *usually* unchanged but may still require tuning
15-
MODPREFIX = MODNAME # The prefix for module-wide routines
15+
MODPREFIX = 'App' # The prefix for module-wide routines
1616
OBJECTTYPE = OBJECTNAME + KIND # The C type used to represent them
1717
OBJECTPREFIX = MODPREFIX + 'Obj' # The prefix for object methods
1818
INPUTFILE = string.lower(MODPREFIX) + 'gen.py' # The file generated by the scanner

‎Mac/Modules/cf/cfsupport.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
import string
99

1010
# Declarations that change for each manager
11-
MODNAME = 'CF' # The name of the module
11+
MODNAME = '_CF' # The name of the module
1212

1313
# The following is *usually* unchanged but may still require tuning
14-
MODPREFIX = MODNAME # The prefix for module-wide routines
14+
MODPREFIX = 'CF' # The prefix for module-wide routines
1515
INPUTFILE = string.lower(MODPREFIX) + 'gen.py' # The file generated by the scanner
1616
OUTPUTFILE = MODNAME + "module.c" # The file generated by this program
1717

‎Mac/Modules/cm/cmsupport.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77

88
# Declarations that change for each manager
99
MACHEADERFILE = 'Components.h' # The Apple header file
10-
MODNAME = 'Cm' # The name of the module
10+
MODNAME = '_Cm' # The name of the module
1111

1212
# The following is *usually* unchanged but may still require tuning
13-
MODPREFIX = MODNAME # The prefix for module-wide routines
13+
MODPREFIX = 'Cm' # The prefix for module-wide routines
1414
C_OBJECTPREFIX = 'CmpObj' # The prefix for object methods
1515
CI_OBJECTPREFIX = 'CmpInstObj'
1616
INPUTFILE = string.lower(MODPREFIX) + 'gen.py' # The file generated by the scanner

‎Mac/Modules/ctl/ctlsupport.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77

88
# Declarations that change for each manager
99
MACHEADERFILE = 'Controls.h' # The Apple header file
10-
MODNAME = 'Ctl' # The name of the module
10+
MODNAME = '_Ctl' # The name of the module
1111
OBJECTNAME = 'Control' # The basic name of the objects used here
1212

1313
# The following is *usually* unchanged but may still require tuning
14-
MODPREFIX = MODNAME # The prefix for module-wide routines
14+
MODPREFIX = 'Ctl' # The prefix for module-wide routines
1515
OBJECTTYPE = OBJECTNAME + 'Handle' # The C type used to represent them
1616
OBJECTPREFIX = MODPREFIX + 'Obj' # The prefix for object methods
1717
INPUTFILE = string.lower(MODPREFIX) + 'gen.py' # The file generated by the scanner

‎Mac/Modules/dlg/dlgsupport.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ def outputFreeIt(self, itselfname):
240240
Output("DisposeDialog(%s);", itselfname)
241241

242242
# Create the generator groups and link them
243-
module = MacModule('Dlg', 'Dlg', includestuff, finalstuff, initstuff)
243+
module = MacModule('_Dlg', 'Dlg', includestuff, finalstuff, initstuff)
244244
object = MyObjectDefinition('Dialog', 'DlgObj', 'DialogPtr')
245245
module.addobject(object)
246246

@@ -300,5 +300,5 @@ def outputFreeIt(self, itselfname):
300300
module.add(f)
301301

302302
# generate output
303-
SetOutputFileName('Dlgmodule.c')
303+
SetOutputFileName('_Dlgmodule.c')
304304
module.generate()

‎Mac/Modules/drag/dragsupport.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77

88
# Declarations that change for each manager
99
MACHEADERFILE = 'Drag.h' # The Apple header file
10-
MODNAME = 'Drag' # The name of the module
10+
MODNAME = '_Drag' # The name of the module
1111
OBJECTNAME = 'DragObj' # The basic name of the objects used here
1212

1313
# The following is *usually* unchanged but may still require tuning
14-
MODPREFIX = MODNAME # The prefix for module-wide routines
14+
MODPREFIX = 'Drag' # The prefix for module-wide routines
1515
OBJECTTYPE = 'DragRef' # The C type used to represent them
1616
OBJECTPREFIX = MODPREFIX + 'Obj' # The prefix for object methods
1717
INPUTFILE = string.lower(MODPREFIX) + 'gen.py' # The file generated by the scanner

‎Mac/Modules/evt/evtsupport.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77

88
# Declarations that change for each manager
99
MACHEADERFILE = 'Events.h' # The Apple header file
10-
MODNAME = 'Evt' # The name of the module
10+
MODNAME = '_Evt' # The name of the module
1111
OBJECTNAME = 'Event' # The basic name of the objects used here
1212
KIND = 'Record' # Usually 'Ptr' or 'Handle'
1313

1414
# The following is *usually* unchanged but may still require tuning
15-
MODPREFIX = MODNAME # The prefix for module-wide routines
15+
MODPREFIX = 'Evt' # The prefix for module-wide routines
1616
OBJECTTYPE = OBJECTNAME + KIND # The C type used to represent them
1717
OBJECTPREFIX = MODPREFIX + 'Obj' # The prefix for object methods
1818
INPUTFILE = string.lower(MODPREFIX) + 'gen.py' # The file generated by the scanner

‎Mac/Modules/fm/fmsupport.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77

88
# Declarations that change for each manager
99
MACHEADERFILE = 'Fonts.h' # The Apple header file
10-
MODNAME = 'Fm' # The name of the module
10+
MODNAME = '_Fm' # The name of the module
1111

1212
# The following is *usually* unchanged but may still require tuning
13-
MODPREFIX = MODNAME # The prefix for module-wide routines
13+
MODPREFIX = 'Fm' # The prefix for module-wide routines
1414
INPUTFILE = string.lower(MODPREFIX) + 'gen.py' # The file generated by the scanner
1515
OUTPUTFILE = MODNAME + "module.c" # The file generated by this program
1616

0 commit comments

Comments
 (0)