* changed syntax of external objcclasses (see wiki/FPC_PasCocoa). Another

    change is that it is now also allowed to specify an external name for
    formal external class definitions, but if they are later mixed with
    regular class definitions the external names have to match.
   o because the "external" status of methods is now set while parsing the
     class rather than afterwards, some procdir compatibility checks had to
     be inlined because they only have to be performed for 
  * also adapted the syntax for external cppclasses in the same way
  * fixed return type of NSObject.retainCount and NSObject.hash
    (NSUInteger instead of cint)
  * moved "patches" directory from cocoaint/src to cocoaint/utils/cocoa-skel
    so they are used by the conversion script when re-parsing the headers
  * updated Objective-C header parser script to
   o use the new external class syntax
   o not write inheritance information for root classes (NSObject, NSProxy)
   o use internal translation tables for some conflicting method names that
    are named specially in objcbase.pp
   and updated parsed headers
  * fixed rtl/inc/objcbase.pp and tests to conform to the new external class
    syntax

git-svn-id: trunk@16684 -

.gitattributes

@@ -1343,8 +1343,6 @@ packages/cocoaint/src/foundation/NSXMLNodeOptions.inc svneol=native#text/plain
 packages/cocoaint/src/foundation/NSXMLParser.inc svneol=native#text/plain
 packages/cocoaint/src/foundation/NSZone.inc svneol=native#text/plain
 packages/cocoaint/src/iPhoneAll.pas svneol=native#text/plain
-packages/cocoaint/src/patches/NSBundle.patch svneol=native#text/plain
-packages/cocoaint/src/patches/NSObjCRuntime.patch svneol=native#text/plain
 packages/cocoaint/src/quartzcore/AnonIncludeClassDefinitionsQuartzcore.inc svneol=native#text/plain
 packages/cocoaint/src/quartzcore/CAAnimation.inc svneol=native#text/plain
 packages/cocoaint/src/quartzcore/CABase.inc svneol=native#text/plain
@@ -1559,6 +1557,8 @@ packages/cocoaint/src/webkit/WebView.inc svneol=native#text/plain
 packages/cocoaint/utils/Make[!!-~]Cocoa[!!-~]Headers.txt svneol=native#text/plain
 packages/cocoaint/utils/Make[!!-~]iPhone[!!-~]Headers.txt svneol=native#text/plain
 packages/cocoaint/utils/Using[!!-~]Installer[!!-~]Script.txt svneol=native#text/plain
+packages/cocoaint/utils/cocoa-skel/patches/NSBundle.patch svneol=native#text/plain
+packages/cocoaint/utils/cocoa-skel/patches/NSObjCRuntime.patch svneol=native#text/plain
 packages/cocoaint/utils/cocoa-skel/src/CocoaAll.pas svneol=native#text/plain
 packages/cocoaint/utils/cocoa-skel/src/CoreData.pas svneol=native#text/plain
 packages/cocoaint/utils/cocoa-skel/src/InlineFunctions.inc svneol=native#text/plain
@@ -9961,6 +9961,7 @@ tests/test/uobjc30c.pp svneol=native#text/plain
 tests/test/uobjc35d.pp svneol=native#text/plain
 tests/test/uobjc35e.pp svneol=native#text/plain
 tests/test/uobjc35f.pp svneol=native#text/plain
+tests/test/uobjc35g.pp svneol=native#text/plain
 tests/test/uobjc7.pp svneol=native#text/plain
 tests/test/uobjcl1.pp svneol=native#text/plain
 tests/test/uprec6.pp svneol=native#text/plain

.gitignore

@@ -658,15 +658,6 @@ packages/cocoaint/src/foundation/build-stamp.*
 packages/cocoaint/src/foundation/fpcmade.*
 packages/cocoaint/src/foundation/units
 packages/cocoaint/src/fpcmade.*
-packages/cocoaint/src/patches/*.bak
-packages/cocoaint/src/patches/*.exe
-packages/cocoaint/src/patches/*.o
-packages/cocoaint/src/patches/*.ppu
-packages/cocoaint/src/patches/*.s
-packages/cocoaint/src/patches/Package.fpc
-packages/cocoaint/src/patches/build-stamp.*
-packages/cocoaint/src/patches/fpcmade.*
-packages/cocoaint/src/patches/units
 packages/cocoaint/src/uikit/*.bak
 packages/cocoaint/src/uikit/*.exe
 packages/cocoaint/src/uikit/*.o
@@ -694,6 +685,15 @@ packages/cocoaint/utils/*.ppu
 packages/cocoaint/utils/*.s
 packages/cocoaint/utils/Package.fpc
 packages/cocoaint/utils/build-stamp.*
+packages/cocoaint/utils/cocoa-skel/patches/*.bak
+packages/cocoaint/utils/cocoa-skel/patches/*.exe
+packages/cocoaint/utils/cocoa-skel/patches/*.o
+packages/cocoaint/utils/cocoa-skel/patches/*.ppu
+packages/cocoaint/utils/cocoa-skel/patches/*.s
+packages/cocoaint/utils/cocoa-skel/patches/Package.fpc
+packages/cocoaint/utils/cocoa-skel/patches/build-stamp.*
+packages/cocoaint/utils/cocoa-skel/patches/fpcmade.*
+packages/cocoaint/utils/cocoa-skel/patches/units
 packages/cocoaint/utils/fpcmade.*
 packages/cocoaint/utils/units
 packages/dbus/*.bak

compiler/msg/errore.msg

@@ -1957,6 +1957,11 @@ sym_e_objc_formal_class_not_resolved=05080_E_No complete definition of the forma
 % of the class to be in scope.
 sym_e_interprocgoto_into_init_final_code_not_allowed=05081_E_Gotos into initialization or finalization blocks of units are not allowed
 % Gotos into initialization or finalization blockse of units are not allowed.
+sym_e_external_class_name_mismatch1=05082=E_Invalid external name "$1" for formal class "$2"
+sym_e_external_class_name_mismatch2=05083=E_Complete class definition with external name "$1" here
+% When a class is declared using a formal external definition, the actual external
+% definition (if any) must specify the same external name as the formal definition
+% (since both definitions refer to the same actual class type).
 %
 % \end{description}
 #

compiler/msgidx.inc

@@ -548,6 +548,8 @@ const
   sym_w_experimental_unit=05079;
   sym_e_objc_formal_class_not_resolved=05080;
   sym_e_interprocgoto_into_init_final_code_not_allowed=05081;
+  sym_e_external_class_name_mismatch1=05082;
+  sym_e_external_class_name_mismatch2=05083;
   cg_e_parasize_too_big=06009;
   cg_e_file_must_call_by_reference=06012;
   cg_e_cant_use_far_pointer_there=06013;
@@ -878,9 +880,9 @@ const
   option_info=11024;
   option_help_pages=11025;
 
-  MsgTxtSize = 58377;
+  MsgTxtSize = 58497;
 
   MsgIdxMax : array[1..20] of longint=(
-    24,88,305,97,82,54,111,22,202,63,
+    24,88,305,97,84,54,111,22,202,63,
     49,20,1,1,1,1,1,1,1,1
   );

compiler/msgtxt.inc

@@ -654,392 +654,392 @@ const msgtxt : array[0..000243,1..240] of char=(
   ' is in scope'#000+
   '05081_E_Gotos into initialization or finalization blocks ','of units ar'+
   'e not allowed'#000+
+  '05082=E_Invalid external name "$1" for formal class "$2"'#000+
+  '05083=E_Complete class definition with external name "$1" here'#000+
   '06009_E_Parameter list size exceeds 65535 bytes'#000+
   '06012_E_File types must be var parameters'#000+
-  '06013_E_The use of a far pointer isn'#039't allowed there'#000+
+  '06013','_E_The use of a far pointer isn'#039't allowed there'#000+
   '06015_E_EXPORT declared functions can'#039't be called'#000+
-  '06016_W_Possible illeg','al call of constructor or destructor'#000+
+  '06016_W_Possible illegal call of constructor or destructor'#000+
   '06017_N_Inefficient code'#000+
   '06018_W_unreachable code'#000+
-  '06020_E_Abstract methods can'#039't be called directly'#000+
+  '06020_E_Abstract methods can'#039't be',' called directly'#000+
   '06027_DL_Register $1 weight $2 $3'#000+
   '06029_DL_Stack frame is omitted'#000+
-  '06031_E_Object or class methods can'#039't',' be inline.'#000+
+  '06031_E_Object or class methods can'#039't be inline.'#000+
   '06032_E_Procvar calls cannot be inline.'#000+
   '06033_E_No code for inline procedure stored'#000+
-  '06035_E_Element zero of an ansi/wide- or longstring can'#039't be acces'+
-  'sed, use (set)length instead'#000+
-  '06037_E_Constructors or destructors cannot be cal','led inside a '#039'w'+
-  'ith'#039' clause'#000+
+  '06035_E_Element zero of ','an ansi/wide- or longstring can'#039't be acc'+
+  'essed, use (set)length instead'#000+
+  '06037_E_Constructors or destructors cannot be called inside a '#039'wit'+
+  'h'#039' clause'#000+
   '06038_E_Cannot call message handler methods directly'#000+
-  '06039_E_Jump in or outside of an exception block'#000+
+  '06039_E_Jump in or outside of an excepti','on block'#000+
   '06040_E_Control flow statements aren'#039't allowed in a finally block'#000+
-  '06041_W_Parameters size exceeds limit for cer','tain cpu'#039's'#000+
+  '06041_W_Parameters size exceeds limit for certain cpu'#039's'#000+
   '06042_W_Local variable size exceed limit for certain cpu'#039's'#000+
-  '06043_E_Local variables size exceeds supported limit'#000+
+  '06043_E_Local variables size exceeds supported lim','it'#000+
   '06044_E_BREAK not allowed'#000+
   '06045_E_CONTINUE not allowed'#000+
-  '06046_F_Unknown compilerproc "$1". Check if you use the correc','t run '+
-  'time library.'#000+
+  '06046_F_Unknown compilerproc "$1". Check if you use the correct run ti'+
+  'me library.'#000+
   '06047_F_Cannot find system type "$1". Check if you use the correct run'+
   ' time library.'#000+
-  '06048_H_Inherited call to abstract method ignored'#000+
+  '06048_H_Inherit','ed call to abstract method ignored'#000+
   '06049_E_Goto label "$1" not defined or optimized away'#000+
-  '06050_F_Cannot find type "$1" i','n unit "$2". Check if you use the cor'+
-  'rect run time library.'#000+
-  '06051_E_Interprocedural gotos are allowed only to outer subroutines'#000+
+  '06050_F_Cannot find type "$1" in unit "$2". Check if you use the corre'+
+  'ct run time library.'#000+
+  '06051_E_Interprocedural gotos are allowed only to outer subr','outines'#000+
   '06052_E_Label must be defined in the same scope as it is declared'#000+
-  '06053_E_Leaving procedures containing explicit',' or implicit exception'+
-  's frames using goto is not allowed'#000+
+  '06053_E_Leaving procedures containing explicit or implicit exceptions '+
+  'frames using goto is not allowed'#000+
   '07000_DL_Starting $1 styled assembler parsing'#000+
-  '07001_DL_Finished $1 styled assembler parsing'#000+
+  '07001_DL_Finished',' $1 styled assembler parsing'#000+
   '07002_E_Non-label pattern contains @'#000+
   '07004_E_Error building record offset'#000+
-  '07005_E_OFFSET us','ed without identifier'#000+
+  '07005_E_OFFSET used without identifier'#000+
   '07006_E_TYPE used without identifier'#000+
   '07007_E_Cannot use local variable or parameters here'#000+
-  '07008_E_need to use OFFSET here'#000+
+  '07008_E_','need to use OFFSET here'#000+
   '07009_E_need to use $ here'#000+
   '07010_E_Cannot use multiple relocatable symbols'#000+
-  '07011_E_Relocatable s','ymbol can only be added'#000+
+  '07011_E_Relocatable symbol can only be added'#000+
   '07012_E_Invalid constant expression'#000+
   '07013_E_Relocatable symbol is not allowed'#000+
-  '07014_E_Invalid reference syntax'#000+
+  '07014_E_Invalid re','ference syntax'#000+
   '07015_E_You cannot reach $1 from that code'#000+
   '07016_E_Local symbols/labels aren'#039't allowed as references'#000+
-  '0701','7_E_Invalid base and index register usage'#000+
+  '07017_E_Invalid base and index register usage'#000+
   '07018_W_Possible error in object field handling'#000+
-  '07019_E_Wrong scale factor specified'#000+
+  '07019_E_Wrong scale factor spe','cified'#000+
   '07020_E_Multiple index register usage'#000+
   '07021_E_Invalid operand type'#000+
   '07022_E_Invalid string as opcode operand: $1'#000+
-  '0','7023_W_@CODE and @DATA not supported'#000+
+  '07023_W_@CODE and @DATA not supported'#000+
   '07024_E_Null label references are not allowed'#000+
-  '07025_E_Divide by zero in asm evaluator'#000+
+  '07025_E_Divide by zero in asm evaluat','or'#000+
   '07026_E_Illegal expression'#000+
   '07027_E_escape sequence ignored: $1'#000+
   '07028_E_Invalid symbol reference'#000+
-  '07029_W_Fwait can cau','se emulation problems with emu387'#000+
+  '07029_W_Fwait can cause emulation problems with emu387'#000+
   '07030_W_$1 without operand translated into $1P'#000+
-  '07031_W_ENTER instruction is not supported by Linux kernel'#000+
+  '07031_W_ENTER instruction is not suppor','ted by Linux kernel'#000+
   '07032_W_Calling an overload function in assembler'#000+
   '07033_E_Unsupported symbol type for operand'#000+
-  '07034_','E_Constant value out of bounds'#000+
+  '07034_E_Constant value out of bounds'#000+
   '07035_E_Error converting decimal $1'#000+
   '07036_E_Error converting octal $1'#000+
-  '07037_E_Error converting binary $1'#000+
+  '07037_E_Error conve','rting binary $1'#000+
   '07038_E_Error converting hexadecimal $1'#000+
   '07039_H_$1 translated to $2'#000+
-  '07040_W_$1 is associated to an overl','oaded function'#000+
+  '07040_W_$1 is associated to an overloaded function'#000+
   '07041_E_Cannot use SELF outside a method'#000+
   '07042_E_Cannot use OLDEBP outside a nested procedure'#000+
-  '07043_W_Procedures can'#039't return any value in asm code'#000+
+  '07043_W_Pro','cedures can'#039't return any value in asm code'#000+
   '07044_E_SEG not supported'#000+
-  '07045_E_Size suffix and destination or source size ','do not match'#000+
+  '07045_E_Size suffix and destination or source size do not match'#000+
   '07046_W_Size suffix and destination or source size do not match'#000+
   '07047_E_Assembler syntax error'#000+
-  '07048_E_Invalid combination of opcode and operands'#000+
+  '07048_E_Inva','lid combination of opcode and operands'#000+
   '07049_E_Assembler syntax error in operand'#000+
-  '07050_E_Assembler syntax error in const','ant'#000+
+  '07050_E_Assembler syntax error in constant'#000+
   '07051_E_Invalid String expression'#000+
   '07052_W_constant with symbol $1 for address which is not on a pointer'#000+
-  '07053_E_Unrecognized opcode $1'#000+
+  '07053_E_Unre','cognized opcode $1'#000+
   '07054_E_Invalid or missing opcode'#000+
   '07055_E_Invalid combination of prefix and opcode: $1'#000+
-  '07056_E_Invali','d combination of override and opcode: $1'#000+
+  '07056_E_Invalid combination of override and opcode: $1'#000+
   '07057_E_Too many operands on line'#000+
   '07058_W_NEAR ignored'#000+
   '07059_W_FAR ignored'#000+
-  '07060_E_Duplicate local symbol $1'#000+
+  '0706','0_E_Duplicate local symbol $1'#000+
   '07061_E_Undefined local symbol $1'#000+
   '07062_E_Unknown label identifier $1'#000+
-  '07063_E_Invalid regi','ster name'#000+
+  '07063_E_Invalid register name'#000+
   '07064_E_Invalid floating point register name'#000+
   '07066_W_Modulo not supported'#000+
-  '07067_E_Invalid floating point constant $1'#000+
+  '07067_E_Invalid floating point const','ant $1'#000+
   '07068_E_Invalid floating point expression'#000+
   '07069_E_Wrong symbol type'#000+
-  '07070_E_Cannot index a local var or parameter',' with a register'#000+
+  '07070_E_Cannot index a local var or parameter with a register'#000+
   '07071_E_Invalid segment override expression'#000+
   '07072_W_Identifier $1 supposed external'#000+
-  '07073_E_Strings not allowed as constants'#000+
+  '07073_E_Strings not',' allowed as constants'#000+
   '07074_No type of variable specified'#000+
   '07075_E_assembler code not returned to text section'#000+
-  '07076_E_No','t a directive or local symbol $1'#000+
+  '07076_E_Not a directive or local symbol $1'#000+
   '07077_E_Using a defined name as a local label'#000+
-  '07078_E_Dollar token is used without an identifier'#000+
+  '07078_E_Dollar token is used without an i','dentifier'#000+
   '07079_W_32bit constant created for address'#000+
   '07080_N_.align is target specific, use .balign or .p2align'#000+
-  '07081_E_','Can'#039't access fields directly for parameters'#000+
+  '07081_E_Can'#039't access fields directly for parameters'#000+
   '07082_E_Can'#039't access fields of objects/classes directly'#000+
-  '07083_E_No size specified and unable to determine the size of the oper'+
-  'ands'#000+
+  '07083_E_No size spec','ified and unable to determine the size of the op'+
+  'erands'#000+
   '07084_E_Cannot use RESULT in this function'#000+
-  '07086_W_"$1" without o','perand translated into "$1 %st,%st(1)"'#000+
+  '07086_W_"$1" without operand translated into "$1 %st,%st(1)"'#000+
   '07087_W_"$1 %st(n)" translated into "$1 %st,%st(n)"'#000+
-  '07088_W_"$1 %st(n)" translated into "$1 %st(n),%st"'#000+
+  '07088_W_"$1 %st(n)" translate','d into "$1 %st(n),%st"'#000+
   '07089_E_Char < not allowed here'#000+
   '07090_E_Char > not allowed here'#000+
   '07093_W_ALIGN not supported'#000+
-  '07094','_E_Inc and Dec cannot be together'#000+
+  '07094_E_Inc and Dec cannot be together'#000+
   '07095_E_Invalid reglist for movem'#000+
   '07096_E_Reglist invalid for opcode'#000+
-  '07097_E_Higher cpu mode required ($1)'#000+
+  '07097_E_Higher cp','u mode required ($1)'#000+
   '07098_W_No size specified and unable to determine the size of the oper'+
-  'ands, using DWORD as default'#000,
+  'ands, using DWORD as default'#000+
   '07099_E_Syntax error while trying to parse a shifter operand'#000+
-  '07100_E_Address of packed component is not at a byte boundary'#000+
+  '07100_E_Address of packed component is not at a byte bounda','ry'#000+
   '07101_W_No size specified and unable to determine the size of the oper'+
   'ands, using BYTE as default'#000+
-  '07102_W_Use of +off','set(%ebp) for parameters invalid here'#000+
+  '07102_W_Use of +offset(%ebp) for parameters invalid here'#000+
   '07103_W_Use of +offset(%ebp) is not compatible with regcall convention'+
   #000+
-  '07104_W_Use of -offset(%ebp) is not recommended for local variable acc'+
-  'ess'#000+
-  '07105_W_Use of -offset(%esp), access may cause a crash or',' value may '+
-  'be lost'#000+
+  '07104_W_Use',' of -offset(%ebp) is not recommended for local variable a'+
+  'ccess'#000+
+  '07105_W_Use of -offset(%esp), access may cause a crash or value may be'+
+  ' lost'#000+
   '07106_E_VMTOffset must be used in combination with a virtual method, a'+
   'nd "$1" is not virtual'#000+
-  '07107_E_Generating PIC, but reference is not PIC-safe'#000+
+  '07107_E_','Generating PIC, but reference is not PIC-safe'#000+
   '07108_E_All registers in a register set must be of the same kind and w'+
-  'idth',#000+
+  'idth'#000+
   '07109_E_A register set cannot be empty'#000+
   '07110_W_@GOTPCREL is useless and potentially dangereous for local symb'+
   'ols'#000+
-  '08000_F_Too many assembler files'#000+
+  '08000_','F_Too many assembler files'#000+
   '08001_F_Selected assembler output not supported'#000+
   '08002_F_Comp not supported'#000+
-  '08003_F_Direct not',' support for binary writers'#000+
+  '08003_F_Direct not support for binary writers'#000+
   '08004_E_Allocating of data is only allowed in bss section'#000+
-  '08005_F_No binary writer selected'#000+
+  '08005_F_No binary writer selected'#000,
   '08006_E_Asm: Opcode $1 not in table'#000+
   '08007_E_Asm: $1 invalid combination of opcode and operands'#000+
-  '08008_E_Asm: 16 Bit refer','ences not supported'#000+
+  '08008_E_Asm: 16 Bit references not supported'#000+
   '08009_E_Asm: Invalid effective address'#000+
   '08010_E_Asm: Immediate or reference expected'#000+
-  '08011_E_Asm: $1 value exceeds bounds $2'#000+
+  '08011_E_Asm: $1 ','value exceeds bounds $2'#000+
   '08012_E_Asm: Short jump is out of range $1'#000+
   '08013_E_Asm: Undefined label $1'#000+
-  '08014_E_Asm: Comp typ','e not supported for this target'#000+
+  '08014_E_Asm: Comp type not supported for this target'#000+
   '08015_E_Asm: Extended type not supported for this target'#000+
-  '08016_E_Asm: Duplicate label $1'#000+
+  '08016_E_Asm: Duplicate label $1',#000+
   '08017_E_Asm: Redefined label $1'#000+
   '08018_E_Asm: First defined here'#000+
   '08019_E_Asm: Invalid register $1'#000+
-  '08020_E_Asm: 16 or 32 ','Bit references not supported'#000+
+  '08020_E_Asm: 16 or 32 Bit references not supported'#000+
   '08021_E_Asm: 64 Bit operands not supported'#000+
   '09000_W_Source operating system redefined'#000+
-  '09001_I_Assembling (pipe) $1'#000+
+  '09001_','I_Assembling (pipe) $1'#000+
   '09002_E_Can'#039't create assembler file: $1'#000+
   '09003_E_Can'#039't create object file: $1'#000+
-  '09004_E_Can'#039't create',' archive file: $1'#000+
+  '09004_E_Can'#039't create archive file: $1'#000+
   '09005_E_Assembler $1 not found, switching to external assembling'#000+
   '09006_T_Using assembler: $1'#000+
-  '09007_E_Error while assembling exitcode $1'#000+
+  '09007_E_E','rror while assembling exitcode $1'#000+
   '09008_E_Can'#039't call the assembler, error $1 switching to external a'+
   'ssembling'#000+
-  '09009_I_As','sembling $1'#000+
+  '09009_I_Assembling $1'#000+
   '09010_I_Assembling with smartlinking $1'#000+
   '09011_W_Object $1 not found, Linking may fail !'#000+
-  '09012_W_Library $1 not found, Linking may fail !'#000+
+  '09012_W_Library $1 n','ot found, Linking may fail !'#000+
   '09013_E_Error while linking'#000+
   '09014_E_Can'#039't call the linker, switching to external linking'#000+
-  '09','015_I_Linking $1'#000+
+  '09015_I_Linking $1'#000+
   '09016_E_Util $1 not found, switching to external linking'#000+
   '09017_T_Using util $1'#000+
-  '09018_E_Creation of Executables not supported'#000+
+  '09018_E_Creation of Exec','utables not supported'#000+
   '09019_E_Creation of Dynamic/Shared Libraries not supported'#000+
   '09020_I_Closing script $1'#000+
-  '09021_E_resou','rce compiler "$1" not found, switching to external mode'+
-  #000+
+  '09021_E_resource compiler "$1" not found, switching to external mode'#000+
   '09022_I_Compiling resource $1'#000+
-  '09023_T_unit $1 can'#039't be statically linked, switching to smart lin'+
-  'king'#000+
+  '09023_T_unit $1 can'#039't be staticall','y linked, switching to smart l'+
+  'inking'#000+
   '09024_T_unit $1 can'#039't be smart linked, switching to static linking'+
   #000+
-  '09025_T_unit $1 ','can'#039't be shared linked, switching to static link'+
-  'ing'#000+
+  '09025_T_unit $1 can'#039't be shared linked, switching to static linkin'+
+  'g'#000+
   '09026_E_unit $1 can'#039't be smart or static linked'#000+
-  '09027_E_unit $1 can'#039't be shared or static linked'#000+
+  '09027_E_unit $1 can'#039,'t be shared or static linked'#000+
   '09028_D_Calling resource compiler "$1" with "$2" as command line'#000+
-  '09029_E_Error while compil','ing resources'#000+
+  '09029_E_Error while compiling resources'#000+
   '09030_E_Can'#039't call the resource compiler "$1", switching to extern'+
   'al mode'#000+
-  '09031_E_Can'#039't open resource file "$1"'#000+
+  '09031_E_Can'#039't open resource file',' "$1"'#000+
   '09032_E_Can'#039't write resource file "$1"'#000+
   '09128_F_Can'#039't post process executable $1'#000+
   '09129_F_Can'#039't open executable $1'#000+
-  '0','9130_X_Size of Code: $1 bytes'#000+
+  '09130_X_Size of Code: $1 bytes'#000+
   '09131_X_Size of initialized data: $1 bytes'#000+
   '09132_X_Size of uninitialized data: $1 bytes'#000+
-  '09133_X_Stack space reserved: $1 bytes'#000+
+  '09','133_X_Stack space reserved: $1 bytes'#000+
   '09134_X_Stack space committed: $1 bytes'#000+
-  '09200_F_Executable image size is too big fo','r $1 target.'#000+
+  '09200_F_Executable image size is too big for $1 target.'#000+
   '09201_W_Object file "$1" contains 32-bit absolute relocation to symbol'+
   ' "$2".'#000+
   '10000_T_Unitsearch: $1'#000+
-  '10001_T_PPU Loading $1'#000+
+  '10001_T','_PPU Loading $1'#000+
   '10002_U_PPU Name: $1'#000+
   '10003_U_PPU Flags: $1'#000+
   '10004_U_PPU Crc: $1'#000+
   '10005_U_PPU Time: $1'#000+
-  '10006_U_PPU File too',' short'#000+
+  '10006_U_PPU File too short'#000+
   '10007_U_PPU Invalid Header (no PPU at the begin)'#000+
   '10008_U_PPU Invalid Version $1'#000+
-  '10009_U_PPU is compiled for another processor'#000+
+  '10009_U_PPU is compiled for anoth','er processor'#000+
   '10010_U_PPU is compiled for another target'#000+
   '10011_U_PPU Source: $1'#000+
   '10012_U_Writing $1'#000+
-  '10013_F_Can'#039't Write PP','U-File'#000+
+  '10013_F_Can'#039't Write PPU-File'#000+
   '10014_F_Error reading PPU-File'#000+
   '10015_F_unexpected end of PPU-File'#000+
   '10016_F_Invalid PPU-File entry: $1'#000+
-  '10017_F_PPU Dbx count problem'#000+
+  '10017_F_PPU ','Dbx count problem'#000+
   '10018_E_Illegal unit name: $1'#000+
   '10019_F_Too much units'#000+
-  '10020_F_Circular unit reference between $1 and $2',#000+
+  '10020_F_Circular unit reference between $1 and $2'#000+
   '10021_F_Can'#039't compile unit $1, no sources available'#000+
   '10022_F_Can'#039't find unit $1 used by $2'#000+
-  '10023_W_Unit $1 was not found but $2 exists'#000+
+  '10023_W_Unit $1 was not found',' but $2 exists'#000+
   '10024_F_Unit $1 searched but $2 found'#000+
   '10025_W_Compiling the system unit requires the -Us switch'#000+
-  '10026_F_T','here were $1 errors compiling module, stopping'#000+
+  '10026_F_There were $1 errors compiling module, stopping'#000+
   '10027_U_Load from $1 ($2) unit $3'#000+
-  '10028_U_Recompiling $1, checksum changed for $2'#000+
+  '10028_U_Recompiling $1, checksum change','d for $2'#000+
   '10029_U_Recompiling $1, source found only'#000+
   '10030_U_Recompiling unit, static lib is older than ppufile'#000+
-  '10031_U_Re','compiling unit, shared lib is older than ppufile'#000+
+  '10031_U_Recompiling unit, shared lib is older than ppufile'#000+
   '10032_U_Recompiling unit, obj and asm are older than ppufile'#000+
-  '10033_U_Recompiling unit, obj is older than asm'#000+
+  '10033_U_Re','compiling unit, obj is older than asm'#000+
   '10034_U_Parsing interface of $1'#000+
   '10035_U_Parsing implementation of $1'#000+
-  '10036_U_Secon','d load for unit $1'#000+
+  '10036_U_Second load for unit $1'#000+
   '10037_U_PPU Check file $1 time $2'#000+
   '10040_W_Can'#039't recompile unit $1, but found modifed include files'#000+
-  '10041_U_File $1 is newer than the one used for creating PPU file $2'#000+
-  '10042_U_Trying to use a unit which was compiled with a',' different FPU'+
-  ' mode'#000+
+  '10','041_U_File $1 is newer than the one used for creating PPU file $2'#000+
+  '10042_U_Trying to use a unit which was compiled with a different FPU m'+
+  'ode'#000+
   '10043_U_Loading interface units from $1'#000+
   '10044_U_Loading implementation units from $1'#000+
-  '10045_U_Interface CRC changed for unit $1'#000+
+  '10045_U_Interfa','ce CRC changed for unit $1'#000+
   '10046_U_Implementation CRC changed for unit $1'#000+
   '10047_U_Finished compiling unit $1'#000+
-  '10048_U_Add','ing dependency: $1 depends on $2'#000+
+  '10048_U_Adding dependency: $1 depends on $2'#000+
   '10049_U_No reload, is caller: $1'#000+
   '10050_U_No reload, already in second compile: $1'#000+
-  '10051_U_Flag for reload: $1'#000+
+  '10051','_U_Flag for reload: $1'#000+
   '10052_U_Forced reloading'#000+
   '10053_U_Previous state of $1: $2'#000+
-  '10054_U_Already compiling $1, setting s','econd compile'#000+
+  '10054_U_Already compiling $1, setting second compile'#000+
   '10055_U_Loading unit $1'#000+
   '10056_U_Finished loading unit $1'#000+
   '10057_U_Registering new unit $1'#000+
-  '10058_U_Re-resolving unit $1'#000+
+  '10058_U_Re-resolv','ing unit $1'#000+
   '10059_U_Skipping re-resolving unit $1, still loading used units'#000+
-  '10060_U_Unloading resource unit $1 (not need','ed)'#000+
+  '10060_U_Unloading resource unit $1 (not needed)'#000+
   '10061_E_Unit $1 was compiled using a different whole program optimizat'+
-  'ion feedback input ($2, $3); recompile it without wpo or use the same '+
-  'wpo feedback input file for this compilation invocation'#000+
-  '10062_U_Indirect interface (objects/clas','ses) CRC changed for unit $1'+
-  #000+
+  'ion feedback input ($2, $3); recompile it with','out wpo or use the sam'+
+  'e wpo feedback input file for this compilation invocation'#000+
+  '10062_U_Indirect interface (objects/classes) CRC changed for unit $1'#000+
   '11000_O_$1 [options] <inputfile> [options]'#000+
-  '11001_W_Only one source file supported, changing source file to compil'+
-  'e from "$1" into "$2"'#000+
+  '11001_W_Only one source file supported, changing',' source file to comp'+
+  'ile from "$1" into "$2"'#000+
   '11002_W_DEF file can be created only for OS/2'#000+
-  '11003_E_nested response files ','are not supported'#000+
+  '11003_E_nested response files are not supported'#000+
   '11004_F_No source file name in command line'#000+
   '11005_N_No option inside $1 config file'#000+
-  '11006_E_Illegal parameter: $1'#000+
+  '11006_E_Illegal pa','rameter: $1'#000+
   '11007_H_-? writes help pages'#000+
   '11008_F_Too many config files nested'#000+
   '11009_F_Unable to open file $1'#000+
-  '11010_D_Rea','ding further options from $1'#000+
+  '11010_D_Reading further options from $1'#000+
   '11011_W_Target is already set to: $1'#000+
-  '11012_W_Shared libs not supported on DOS platform, reverting to static'+
-  #000+
+  '11012_W_Shared libs not supported on DOS platform, rev','erting to stat'+
+  'ic'#000+
   '11013_F_In options file $1 at line $2 too many \var{\#IF(N)DEFs} encou'+
   'ntered'#000+
-  '11014_F_In options file $1',' at line $2 unexpected \var{\#ENDIFs} enco'+
-  'untered'#000+
+  '11014_F_In options file $1 at line $2 unexpected \var{\#ENDIFs} encoun'+
+  'tered'#000+
   '11015_F_Open conditional at the end of the options file'#000+
-  '11016_W_Debug information generation is not supported by this executab'+
-  'le'#000+
+  '11016_W_Debug ','information generation is not supported by this execut'+
+  'able'#000+
   '11017_H_Try recompiling with -dGDB'#000+
-  '11018_W_You are using the ','obsolete switch $1'#000+
+  '11018_W_You are using the obsolete switch $1'#000+
   '11019_W_You are using the obsolete switch $1, please use $2'#000+
-  '11020_N_Switching assembler to default source writing assembler'#000+
+  '11020_N_Switching assembler to default so','urce writing assembler'#000+
   '11021_W_Assembler output selected "$1" is not compatible with "$2"'#000+
-  '11022_W_"$1" assembler use for','ced'#000+
+  '11022_W_"$1" assembler use forced'#000+
   '11026_T_Reading options from file $1'#000+
   '11027_T_Reading options from environment $1'#000+
   '11028_D_Handling option "$1"'#000+
-  '11029_O_*** press enter ***'#000+
+  '11029_','O_*** press enter ***'#000+
   '11030_H_Start of reading config file $1'#000+
   '11031_H_End of reading config file $1'#000+
-  '11032_D_interpreting',' option "$1"'#000+
+  '11032_D_interpreting option "$1"'#000+
   '11036_D_interpreting firstpass option "$1"'#000+
   '11033_D_interpreting file option "$1"'#000+
-  '11034_D_Reading config file "$1"'#000+
+  '11034_D_Reading config fil','e "$1"'#000+
   '11035_D_found source file name "$1"'#000+
   '11039_E_Unknown code page'#000+
   '11040_F_Config file $1 is a directory'#000+
-  '11041_W_Assem','bler output selected "$1" cannot generate debug info, d'+
-  'ebugging disabled'#000+
-  '11042_W_Use of ppc386.cfg is deprecated, please use fpc.cfg instead'#000+
+  '11041_W_Assembler output selected "$1" cannot generate debug info, deb'+
+  'ugging disabled'#000+
+  '11042_W_Use of ppc386.cfg is deprecated, please',' use fpc.cfg instead'#000+
   '11043_F_In options file $1 at line $2 \var{\#ELSE} directive without \'+
   'var{\#IF(N)DEF} found'#000+
-  '11044_F','_Option "$1" is not, or not yet, supported on the current tar'+
-  'get platform'#000+
-  '11045_F_The feature "$1" is not, or not yet, supported on the selected'+
-  ' target platform'#000+
+  '11044_F_Option "$1" is not, or not yet, supported on the current targe'+
+  't platform'#000+
+  '11045_F_The feature "$1" is not, or not yet, s','upported on the select'+
+  'ed target platform'#000+
   '11046_N_DWARF debug information cannot be used with smart linking on t'+
-  'his targe','t, switching to static linking'#000+
+  'his target, switching to static linking'#000+
   '11047_W_Option "$1" is ignored for the current target platform.'#000+
-  '11048_W_Disabling external debug information because it is unsupported'+
-  ' for the selected target/debug format combination.'#000+
-  '12000_F_Cannot open whol','e program optimization feedback file "$1"'#000+
+  '11048_W_Disabling externa','l debug information because it is unsupport'+
+  'ed for the selected target/debug format combination.'#000+
+  '12000_F_Cannot open whole program optimization feedback file "$1"'#000+
   '12001_D_Processing whole program optimization information in wpo feedb'+
-  'ack file "$1"'#000+
+  'ack file',' "$1"'#000+
   '12002_D_Finished processing the whole program optimization information'+
   ' in wpo feedback file "$1"'#000+
-  '12003_E_Expected ','section header, but got "$2" at line $1 of wpo feed'+
-  'back file'#000+
-  '12004_W_No handler registered for whole program optimization section "'+
-  '$2" at line $1 of wpo feedback file, ignoring'#000+
-  '12005_D_Found whole program optimization section "$1" with info','rmati'+
-  'on about "$2"'#000+
+  '12003_E_Expected section header, but got "$2" at line $1 of wpo feedba'+
+  'ck file'#000+
+  '12004_W_No handler registered for whole program optimizatio','n section'+
+  ' "$2" at line $1 of wpo feedback file, ignoring'#000+
+  '12005_D_Found whole program optimization section "$1" with information'+
+  ' about "$2"'#000+
   '12006_F_The selected whole program optimizations require a previously '+
-  'generated feedback file (use -Fw to specify)'#000+
+  'generated feedback file (use -F','w to specify)'#000+
   '12007_E_No collected information necessary to perform "$1" whole progr'+
   'am optimization found'#000+
-  '12008_F_Specif','y a whole program optimization feedback file to store '+
-  'the generated info in (using -FW)'#000+
-  '12009_E_Not generating any whole program optimization information, yet'+
-  ' a feedback file was specified (using -FW)'#000+
-  '12010_E_Not performing any whole progra','m optimizations, yet an input'+
-  ' feedback file was specified (using -Fw)'#000+
-  '12011_D_Skipping whole program optimization section "$1", because not '+
-  'needed by the requested optimizations'#000+
-  '12012_W_Overriding previously read information for "$1" from f','eedbac'+
-  'k input file using information in section "$2"'#000+
-  '12013_E_Cannot extract symbol liveness information from program when s'+
-  'tripping symbols, use -Xs-'#000+
+  '12008_F_Specify a whole program optimization feedback file to store th'+
+  'e generated info in (using -FW)'#000+
+  '12009_E_Not generating any whole',' program optimization information, y'+
+  'et a feedback file was specified (using -FW)'#000+
+  '12010_E_Not performing any whole program optimizations, yet an input f'+
+  'eedback file was specified (using -Fw)'#000+
+  '12011_D_Skipping whole program optimization sectio','n "$1", because no'+
+  't needed by the requested optimizations'#000+
+  '12012_W_Overriding previously read information for "$1" from feedback '+
+  'input file using information in section "$2"'#000+
+  '12013_E_Cannot extract symbol liveness information from program whe','n'+
+  ' stripping symbols, use -Xs-'#000+
   '12014_E_Cannot extract symbol liveness information from program when w'+
   'hen not linking'#000+
-  '1201','5_F_Cannot find "$1" or "$2" to extract symbol liveness informat'+
-  'ion from linked program'#000+
-  '12016_E_Error during reading symbol liveness information produced by "'+
-  '$1"'#000+
+  '12015_F_Cannot find "$1" or "$2" to extract symbol liveness informatio'+
+  'n from linked program'#000+
+  '12016_E_Error during reading sym','bol liveness information produced by'+
+  ' "$1"'#000+
   '12017_F_Error executing "$1" (exitcode: $2) to extract symbol informat'+
-  'ion from',' linked program'#000+
+  'ion from linked program'#000+
   '12018_E_Collection of symbol liveness information can only help when u'+
   'sing smart linking, use -CX -XX'#000+
-  '12019_E_Cannot create specified whole program optimisation feedback fi'+
-  'le "$1"'#000+
-  '11023_Free Pascal Compiler version $FPCFULLV','ERSION [$FPCDATE] for $F'+
-  'PCCPU'#010+
+  '12','019_E_Cannot create specified whole program optimisation feedback '+
+  'file "$1"'#000+
+  '11023_Free Pascal Compiler version $FPCFULLVERSION [$FPCDATE] for $FPC'+
+  'CPU'#010+
   'Copyright (c) 1993-2010 by Florian Klaempfl'#000+
-  '11024_Free Pascal Compiler version $FPCVERSION'#010+
+  '11024_Free Pascal Compiler version $FPCVERSION',#010+
   #010+
   'Compiler Date      : $FPCDATE'#010+
   'Compiler CPU Target: $FPCCPU'#010+
@@ -1047,7 +1047,7 @@ const msgtxt : array[0..000243,1..240] of char=(
   'Supported targets:'#010+
   '  $OSTARGETS'#010+
   #010+
-  'Supported CPU instruction',' sets:'#010+
+  'Supported CPU instruction sets:'#010+
   '  $INSTRUCTIONSETS'#010+
   #010+
   'Supported FPU instruction sets:'#010+
@@ -1055,7 +1055,7 @@ const msgtxt : array[0..000243,1..240] of char=(
   #010+
   'Supported ABI targets:'#010+
   '  $ABITARGETS'#010+
-  #010+
+  #010,
   'Supported Optimizations:'#010+
   '  $OPTIMIZATIONS'#010+
   #010+
@@ -1063,307 +1063,308 @@ const msgtxt : array[0..000243,1..240] of char=(
   '  All'#010+
   '  $WPOPTIMIZATIONS'#010+
   #010+
-  'Supported Mi','crocontroller types:'#010+
+  'Supported Microcontroller types:'#010+
   '  $CONTROLLERTYPES'#010+
   #010+
   'This program comes under the GNU General Public Licence'#010+
-  'For more information read COPYING.FPC'#010+
+  'For more information re','ad COPYING.FPC'#010+
   #010+
   'Report bugs, suggestions, etc. to:'#010+
   '                 http://bugs.freepascal.org'#010+
   'or'#010+
-  '                 bugs@','freepascal.org'#000+
+  '                 [email protected]'#000+
   '11025_**0*_Put + after a boolean switch option to enable it, - to disa'+
   'ble it'#010+
-  '**1a_The compiler doesn'#039't delete the generated assembler file'#010+
+  '**1a_The compiler doesn'#039't de','lete the generated assembler file'#010+
   '**2al_List sourcecode lines in assembler file'#010+
   '**2an_List node info in assembler file'#010+
-  '*','L2ap_Use pipes instead of creating temporary assembler files'#010+
-  '**2ar_List register allocation/release info in assembler file'#010+
+  '*L2ap_Use pipes instead of creating temporary assembler files'#010+
+  '**2ar_List register allocation/release info in assembler fi','le'#010+
   '**2at_List temp allocation/release info in assembler file'#010+
   '**1A<x>_Output format:'#010+
   '**2Adefault_Use default assembler'#010+
-  '3*','2Aas_Assemble using GNU AS'#010+
+  '3*2Aas_Assemble using GNU AS'#010+
   '3*2Amacho_Mach-O (Darwin, Intel 32 bit) using internal writer'#010+
-  '3*2Anasmcoff_COFF (Go32v2) file using Nasm'#010+
+  '3*2Anasmcoff_COFF (Go32v2) file',' using Nasm'#010+
   '3*2Anasmelf_ELF32 (Linux) file using Nasm'#010+
   '3*2Anasmwin32_Win32 object file using Nasm'#010+
-  '3*2Anasmwdosx_Win32/WDO','SX object file using Nasm'#010+
+  '3*2Anasmwdosx_Win32/WDOSX object file using Nasm'#010+
   '3*2Awasm_Obj file using Wasm (Watcom)'#010+
   '3*2Anasmobj_Obj file using Nasm'#010+
-  '3*2Amasm_Obj file using Masm (Microsoft)'#010+
+  '3*2Amasm_Obj file using ','Masm (Microsoft)'#010+
   '3*2Atasm_Obj file using Tasm (Borland)'#010+
   '3*2Aelf_ELF (Linux) using internal writer'#010+
-  '3*2Acoff_COFF (Go32v2)',' using internal writer'#010+
+  '3*2Acoff_COFF (Go32v2) using internal writer'#010+
   '3*2Apecoff_PE-COFF (Win32) using internal writer'#010+
   '4*2Aas_Assemble using GNU AS'#010+
-  '6*2Aas_Unix o-file using GNU AS'#010+
+  '6*2Aas_Unix o-file ','using GNU AS'#010+
   '6*2Agas_GNU Motorola assembler'#010+
   '6*2Amit_MIT Syntax (old GAS)'#010+
   '6*2Amot_Standard Motorola assembler'#010+
-  'A*2Aas_Asse','mble using GNU AS'#010+
+  'A*2Aas_Assemble using GNU AS'#010+
   'P*2Aas_Assemble using GNU AS'#010+
   'S*2Aas_Assemble using GNU AS'#010+
   '**1b_Generate browser info'#010+
-  '**2bl_Generate local symbol info'#010+
+  '**2bl_Generate lo','cal symbol info'#010+
   '**1B_Build all modules'#010+
   '**1C<x>_Code generation options:'#010+
-  '**2C3<x>_Turn on ieee error checking for constan','ts'#010+
+  '**2C3<x>_Turn on ieee error checking for constants'#010+
   '**2Ca<x>_Select ABI, see fpc -i for possible values'#010+
   '**2Cb_Generate big-endian code'#010+
-  '**2Cc<x>_Set default calling convention to <x>'#010+
+  '**2Cc<x>_Set default calling conve','ntion to <x>'#010+
   '**2CD_Create also dynamic library (not supported)'#010+
   '**2Ce_Compilation with emulated floating point opcodes'#010+
-  '**','2Cf<x>_Select fpu instruction set to use, see fpc -i for possible '+
-  'values'#010+
-  '**2CF<x>_Minimal floating point constant precision (default, 32, 64)'#010+
+  '**2Cf<x>_Select fpu instruction set to use, see fpc -i for possible va'+
+  'lues'#010+
+  '**2CF<x>_Minimal floating point constant precis','ion (default, 32, 64)'+
+  #010+
   '**2Cg_Generate PIC code'#010+
   '**2Ch<n>_<n> bytes heap (between 1023 and 67107840)'#010+
   '**2Ci_IO-checking'#010+
-  '**2C','n_Omit linking stage'#010+
+  '**2Cn_Omit linking stage'#010+
   '**2Co_Check overflow of integer operations'#010+
-  '**2CO_Check for possible overflow of integer operations'#010+
+  '**2CO_Check for possible overflow of integer operations'#010,
   '**2Cp<x>_Select instruction set, see fpc -i for possible values'#010+
   '**2CP<x>=<y>_ packing settings'#010+
-  '**3CPPACKSET=<y>_ <y> set',' allocation: 0, 1 or DEFAULT or NORMAL, 2, '+
-  '4 and 8'#010+
+  '**3CPPACKSET=<y>_ <y> set allocation: 0, 1 or DEFAULT or NORMAL, 2, 4 '+
+  'and 8'#010+
   '**2Cr_Range checking'#010+
   '**2CR_Verify object method call validity'#010+
-  '**2Cs<n>_Set stack checking size to <n>'#010+
+  '**2Cs<n','>_Set stack checking size to <n>'#010+
   '**2Ct_Stack checking (for testing only, see manual)'#010+
-  '**2CX_Create also smartlinked libra','ry'#010+
+  '**2CX_Create also smartlinked library'#010+
   '**1d<x>_Defines the symbol <x>'#010+
   '**1D_Generate a DEF file'#010+
   '**2Dd<x>_Set description to <x>'#010+
-  '**2Dv<x>_Set DLL version to <x>'#010+
+  '**2Dv<x>_Set DLL version to <','x>'#010+
   '*O2Dw_PM application'#010+
   '**1e<x>_Set path to executable'#010+
   '**1E_Same as -Cn'#010+
   '**1fPIC_Same as -Cg'#010+
-  '**1F<x>_Set file names and p','aths:'#010+
+  '**1F<x>_Set file names and paths:'#010+
   '**2Fa<x>[,y]_(for a program) load units <x> and [y] before uses is par'+
   'sed'#010+
   '**2Fc<x>_Set input codepage to <x>'#010+
-  '**2FC<x>_Set RC compiler binary name to <x>'#010+
+  '**2FC','<x>_Set RC compiler binary name to <x>'#010+
   '**2Fd_Disable the compiler'#039's internal directory cache'#010+
-  '**2FD<x>_Set the directory ','where to search for compiler utilities'#010+
+  '**2FD<x>_Set the directory where to search for compiler utilities'#010+
   '**2Fe<x>_Redirect error output to <x>'#010+
-  '**2Ff<x>_Add <x> to framework path (Darwin only)'#010+
+  '**2Ff<x>_Add <x> to framework path (Darwin ','only)'#010+
   '**2FE<x>_Set exe/unit output path to <x>'#010+
   '**2Fi<x>_Add <x> to include path'#010+
   '**2Fl<x>_Add <x> to library path'#010+
-  '**2FL<x','>_Use <x> as dynamic linker'#010+
+  '**2FL<x>_Use <x> as dynamic linker'#010+
   '**2Fm<x>_Load unicode conversion table from <x>.txt in the compiler di'+
   'r'#010+
-  '**2Fo<x>_Add <x> to object path'#010+
+  '**2Fo<x>_Add <x> to ','object path'#010+
   '**2Fr<x>_Load error message file <x>'#010+
   '**2FR<x>_Set resource (.res) linker to <x>'#010+
-  '**2Fu<x>_Add <x> to unit pat','h'#010+
+  '**2Fu<x>_Add <x> to unit path'#010+
   '**2FU<x>_Set unit output path to <x>, overrides -FE'#010+
-  '**2FW<x>_Store generated whole-program optimization feedback in <x>'#010+
+  '**2FW<x>_Store generated whole-program optimization feedback in <x','>'#010+
   '**2Fw<x>_Load previously stored whole-program optimization feedback fr'+
   'om <x>'#010+
-  '*g1g_Generate debug information (default ','format for target)'#010+
+  '*g1g_Generate debug information (default format for target)'#010+
   '*g2gc_Generate checks for pointers'#010+
   '*g2gh_Use heaptrace unit (for memory leak/corruption debugging)'#010+
-  '*g2gl_Use line info unit (show more info with backtraces)'#010+
+  '*g','2gl_Use line info unit (show more info with backtraces)'#010+
   '*g2go<x>_Set debug information options'#010+
-  '*g3godwarfsets_ Enable DW','ARF '#039'set'#039' type debug information (b'+
-  'reaks gdb < 6.5)'#010+
-  '*g3gostabsabsincludes_ Store absolute/full include file paths in Stabs'+
-  #010+
+  '*g3godwarfsets_ Enable DWARF '#039'set'#039' type debug information (bre'+
+  'aks gdb < 6.5)'#010+
+  '*g3gostabsabsincludes_ Store absolute/full include file paths in Sta','b'+
+  's'#010+
   '*g3godwarfmethodclassprefix_ Prefix method names in DWARF with class n'+
   'ame'#010+
   '*g2gp_Preserve case in stabs symbol names'#010+
-  '*','g2gs_Generate Stabs debug information'#010+
+  '*g2gs_Generate Stabs debug information'#010+
   '*g2gt_Trash local variables (to detect uninitialized uses)'#010+
-  '*g2gv_Generates programs traceable with Valgrind'#010+
+  '*g2gv_Generates program','s traceable with Valgrind'#010+
   '*g2gw_Generate DWARFv2 debug information (same as -gw2)'#010+
-  '*g2gw2_Generate DWARFv2 debug informat','ion'#010+
+  '*g2gw2_Generate DWARFv2 debug information'#010+
   '*g2gw3_Generate DWARFv3 debug information'#010+
   '*g2gw4_Generate DWARFv4 debug information (experimental)'#010+
-  '**1i_Information'#010+
+  '**1i_Information'#010,
   '**2iD_Return compiler date'#010+
   '**2iV_Return short compiler version'#010+
   '**2iW_Return full compiler version'#010+
-  '**2iSO_Return compiler',' OS'#010+
+  '**2iSO_Return compiler OS'#010+
   '**2iSP_Return compiler host processor'#010+
   '**2iTO_Return target OS'#010+
   '**2iTP_Return target processor'#010+
-  '**1I<x>_Add <x> to include path'#010+
+  '**1I<x>_Add <x> to incl','ude path'#010+
   '**1k<x>_Pass <x> to the linker'#010+
   '**1l_Write logo'#010+
   '**1M<x>_Set language mode to <x>'#010+
-  '**2Mfpc_Free Pascal dialect (de','fault)'#010+
+  '**2Mfpc_Free Pascal dialect (default)'#010+
   '**2Mobjfpc_FPC mode with Object Pascal support'#010+
   '**2Mdelphi_Delphi 7 compatibility mode'#010+
-  '**2Mtp_TP/BP 7.0 compatibility mode'#010+
+  '**2Mtp_TP/BP 7.0 compatibil','ity mode'#010+
   '**2Mmacpas_Macintosh Pascal dialects compatibility mode'#010+
   '**1n_Do not read the default config files'#010+
-  '**1N<x>_Node ','tree optimizations'#010+
+  '**1N<x>_Node tree optimizations'#010+
   '**2Nu_Unroll loops'#010+
   '**1o<x>_Change the name of the executable produced to <x>'#010+
   '**1O<x>_Optimizations:'#010+
-  '**2O-_Disable optimizations'#010+
+  '*','*2O-_Disable optimizations'#010+
   '**2O1_Level 1 optimizations (quick and debugger friendly)'#010+
-  '**2O2_Level 2 optimizations (-O1 + ','quick optimizations)'#010+
+  '**2O2_Level 2 optimizations (-O1 + quick optimizations)'#010+
   '**2O3_Level 3 optimizations (-O2 + slow optimizations)'#010+
   '**2Oa<x>=<y>_Set alignment'#010+
-  '**2Oo[NO]<x>_Enable or disable optimizations, see fpc -i for possible '+
-  'values'#010+
-  '**2Op<x>_Set target cpu for optimizing, see fpc -i for possi','ble valu'+
-  'es'#010+
+  '**2Oo[NO]<x>_Enab','le or disable optimizations, see fpc -i for possibl'+
+  'e values'#010+
+  '**2Op<x>_Set target cpu for optimizing, see fpc -i for possible values'+
+  #010+
   '**2OW<x>_Generate whole-program optimization feedback for optimization'+
   ' <x>, see fpc -i for possible values'#010+
-  '**2Ow<x>_Perform whole-program optimization <x>, see fpc -i for possib'+
-  'le values'#010+
-  '**2Os_Optimize for size rather than speed'#010,
+  '**','2Ow<x>_Perform whole-program optimization <x>, see fpc -i for poss'+
+  'ible values'#010+
+  '**2Os_Optimize for size rather than speed'#010+
   '**1pg_Generate profile code for gprof (defines FPC_PROFILE)'#010+
   '**1R<x>_Assembler reading style:'#010+
-  '**2Rdefault_Use default assembler for target'#010+
+  '**2Rdefault_Use default ass','embler for target'#010+
   '3*2Ratt_Read AT&T style assembler'#010+
   '3*2Rintel_Read Intel style assembler'#010+
-  '6*2RMOT_Read motorola style ass','embler'#010+
+  '6*2RMOT_Read motorola style assembler'#010+
   '**1S<x>_Syntax options:'#010+
   '**2S2_Same as -Mobjfpc'#010+
   '**2Sc_Support operators like C (*=,+=,/= and -=)'#010+
-  '**2Sa_Turn on assertions'#010+
+  '**2Sa_Turn on ass','ertions'#010+
   '**2Sd_Same as -Mdelphi'#010+
   '**2Se<x>_Error options. <x> is a combination of the following:'#010+
-  '**3*_<n> : Compiler halts ','after the <n> errors (default is 1)'#010+
+  '**3*_<n> : Compiler halts after the <n> errors (default is 1)'#010+
   '**3*_w : Compiler also halts after warnings'#010+
-  '**3*_n : Compiler also halts after notes'#010+
+  '**3*_n : Compiler also halts after notes',#010+
   '**3*_h : Compiler also halts after hints'#010+
   '**2Sg_Enable LABEL and GOTO (default in -Mtp and -Mdelphi)'#010+
-  '**2Sh_Use ansistrin','gs by default instead of shortstrings'#010+
+  '**2Sh_Use ansistrings by default instead of shortstrings'#010+
   '**2Si_Turn on inlining of procedures/functions declared as "inline"'#010+
-  '**2Sk_Load fpcylix unit'#010+
+  '**2Sk_Load fpc','ylix unit'#010+
   '**2SI<x>_Set interface style to <x>'#010+
   '**3SIcom_COM compatible interface (default)'#010+
-  '**3SIcorba_CORBA compatible in','terface'#010+
+  '**3SIcorba_CORBA compatible interface'#010+
   '**2Sm_Support macros like C (global)'#010+
   '**2So_Same as -Mtp'#010+
-  '**2Ss_Constructor name must be init (destructor must be done)'#010+
+  '**2Ss_Constructor name must be init (destructor must be ','done)'#010+
   '**2Sx_Enable exception keywords (default in Delphi/ObjFPC modes)'#010+
   '**1s_Do not call assembler and linker'#010+
-  '**2sh_Gener','ate script to link on host'#010+
+  '**2sh_Generate script to link on host'#010+
   '**2st_Generate script to link on target'#010+
-  '**2sr_Skip register allocation phase (use with -alr)'#010+
+  '**2sr_Skip register allocation phase (use with -alr)'#010,
   '**1T<x>_Target operating system:'#010+
   '3*2Tdarwin_Darwin/Mac OS X'#010+
   '3*2Temx_OS/2 via EMX (including EMX/RSX extender)'#010+
-  '3*2Tfreebs','d_FreeBSD'#010+
+  '3*2Tfreebsd_FreeBSD'#010+
   '3*2Tgo32v2_Version 2 of DJ Delorie DOS extender'#010+
-  '3*2Tiphonesim_ iPhoneSimulator from iOS SDK 3.2+ (older versions: -Tda'+
-  'rwin)'#010+
+  '3*2Tiphonesim_ iPhoneSimulator from iOS SDK 3.2+ (older versio','ns: -T'+
+  'darwin)'#010+
   '3*2Tlinux_Linux'#010+
   '3*2Tnetbsd_NetBSD'#010+
   '3*2Tnetware_Novell Netware Module (clib)'#010+
-  '3*2Tnetwlibc_Novell Netware Mod','ule (libc)'#010+
+  '3*2Tnetwlibc_Novell Netware Module (libc)'#010+
   '3*2Topenbsd_OpenBSD'#010+
   '3*2Tos2_OS/2 / eComStation'#010+
   '3*2Tsunos_SunOS/Solaris'#010+
   '3*2Tsymbian_Symbian OS'#010+
-  '3*2Tsolaris_Solaris'#010+
+  '3*2Tsolaris_Sol','aris'#010+
   '3*2Twatcom_Watcom compatible DOS extender'#010+
   '3*2Twdosx_WDOSX DOS extender'#010+
   '3*2Twin32_Windows 32 Bit'#010+
-  '3*2Twince_Windows C','E'#010+
+  '3*2Twince_Windows CE'#010+
   '4*2Tdarwin_Darwin/Mac OS X'#010+
   '4*2Tlinux_Linux'#010+
   '4*2Twin64_Win64 (64 bit Windows systems)'#010+
   '6*2Tamiga_Commodore Amiga'#010+
-  '6*2Tatari_Atari ST/STe/TT'#010+
+  '6*2Tatar','i_Atari ST/STe/TT'#010+
   '6*2Tlinux_Linux'#010+
   '6*2Tpalmos_PalmOS'#010+
   'A*2Tdarwin_Darwin/iPhoneOS/iOS'#010+
   'A*2Tlinux_Linux'#010+
-  'A*2Twince_Windows CE'#010,
+  'A*2Twince_Windows CE'#010+
   'P*2Tamiga_AmigaOS'#010+
   'P*2Tdarwin_Darwin/Mac OS X'#010+
   'P*2Tlinux_Linux'#010+
   'P*2Tmacos_Mac OS (classic)'#010+
   'P*2Tmorphos_MorphOS'#010+
-  'S*2Tsolaris_Solaris'#010+
+  'S*2Tsolaris_','Solaris'#010+
   'S*2Tlinux_Linux'#010+
   '**1u<x>_Undefines the symbol <x>'#010+
   '**1U_Unit options:'#010+
-  '**2Un_Do not check where the unit name match','es the file name'#010+
+  '**2Un_Do not check where the unit name matches the file name'#010+
   '**2Ur_Generate release unit files (never automatically recompiled)'#010+
   '**2Us_Compile a system unit'#010+
-  '**1v<x>_Be verbose. <x> is a combination of the following letters:'#010+
-  '**2*_e : Show errors (default)       0 : Show nothing (except',' errors'+
-  ')'#010+
+  '**1v<x>_','Be verbose. <x> is a combination of the following letters:'#010+
+  '**2*_e : Show errors (default)       0 : Show nothing (except errors)'#010+
   '**2*_w : Show warnings               u : Show unit info'#010+
-  '**2*_n : Show notes                  t : Show tried/used files'#010+
+  '**2*_n : Show notes                  t : Show tried/use','d files'#010+
   '**2*_h : Show hints                  c : Show conditionals'#010+
-  '**2*_i : Show general info           d : Show debug i','nfo'#010+
+  '**2*_i : Show general info           d : Show debug info'#010+
   '**2*_l : Show linenumbers            r : Rhide/GCC compatibility mode'#010+
-  '**2*_s : Show time stamps            q : Show message numbers'#010+
+  '**2*_s : Show time stamps            q : Show ','message numbers'#010+
   '**2*_a : Show everything             x : Executable info (Win32 only)'#010+
-  '**2*_b : Write file names messages','   p : Write tree.log with parse t'+
-  'ree'#010+
+  '**2*_b : Write file names messages   p : Write tree.log with parse tre'+
+  'e'#010+
   '**2*_    with full path              v : Write fpcdebug.txt with'#010+
-  '**2*_                                    lots of debugging info'#010+
+  '**2*_            ','                        lots of debugging info'#010+
   '**2*_m<x>,<y> : Don'#039't show messages numbered <x> and <y>'#010+
-  '3*1W<x>_Target-s','pecific options (targets)'#010+
+  '3*1W<x>_Target-specific options (targets)'#010+
   'A*1W<x>_Target-specific options (targets)'#010+
   'P*1W<x>_Target-specific options (targets)'#010+
-  'p*1W<x>_Target-specific options (targets)'#010+
+  'p*1W<x>_Ta','rget-specific options (targets)'#010+
   '3*2Wb_Create a bundle instead of a library (Darwin)'#010+
-  'P*2Wb_Create a bundle instead of a l','ibrary (Darwin)'#010+
+  'P*2Wb_Create a bundle instead of a library (Darwin)'#010+
   'p*2Wb_Create a bundle instead of a library (Darwin)'#010+
   '3*2WB_Create a relocatable image (Windows)'#010+
-  'A*2WB_Create a relocatable image (Windows, Symbian)'#010+
+  'A*2WB_Cre','ate a relocatable image (Windows, Symbian)'#010+
   '3*2WC_Specify console type application (EMX, OS/2, Windows)'#010+
-  'A*2WC_Specify con','sole type application (Windows)'#010+
+  'A*2WC_Specify console type application (Windows)'#010+
   'P*2WC_Specify console type application (Classic Mac OS)'#010+
-  '3*2WD_Use DEFFILE to export functions of DLL or EXE (Windows)'#010+
+  '3*2WD_Use DEFFILE to export func','tions of DLL or EXE (Windows)'#010+
   'A*2WD_Use DEFFILE to export functions of DLL or EXE (Windows)'#010+
-  '3*2We_Use external resources',' (Darwin)'#010+
+  '3*2We_Use external resources (Darwin)'#010+
   '4*2We_Use external resources (Darwin)'#010+
   'A*2We_Use external resources (Darwin)'#010+
-  'P*2We_Use external resources (Darwin)'#010+
+  'P*2We_Use external resources (Darw','in)'#010+
   'p*2We_Use external resources (Darwin)'#010+
   '3*2WF_Specify full-screen type application (EMX, OS/2)'#010+
-  '3*2WG_Specify graphic t','ype application (EMX, OS/2, Windows)'#010+
+  '3*2WG_Specify graphic type application (EMX, OS/2, Windows)'#010+
   'A*2WG_Specify graphic type application (Windows)'#010+
-  'P*2WG_Specify graphic type application (Classic Mac OS)'#010+
+  'P*2WG_Specify graphic type applica','tion (Classic Mac OS)'#010+
   '3*2Wi_Use internal resources (Darwin)'#010+
   'P*2Wi_Use internal resources (Darwin)'#010+
-  'p*2Wi_Use internal res','ources (Darwin)'#010+
+  'p*2Wi_Use internal resources (Darwin)'#010+
   '3*2WN_Do not generate relocation code, needed for debugging (Windows)'#010+
-  'A*2WN_Do not generate relocation code, needed for debugging (Windows)'#010+
+  'A*2WN_Do not generate relocation c','ode, needed for debugging (Windows'+
+  ')'#010+
   '3*2WR_Generate relocation code (Windows)'#010+
   'A*2WR_Generate relocation code (Windows)'#010+
-  'P*','2WT_Specify MPW tool type application (Classic Mac OS)'#010+
+  'P*2WT_Specify MPW tool type application (Classic Mac OS)'#010+
   '3*2WX_Enable executable stack (Linux)'#010+
-  'A*2WX_Enable executable stack (Linux)'#010+
+  'A*2WX_Enable executable sta','ck (Linux)'#010+
   'p*2WX_Enable executable stack (Linux)'#010+
   'P*2WX_Enable executable stack (Linux)'#010+
   '**1X_Executable options:'#010+
-  '**2Xc_Pa','ss --shared/-dynamic to the linker (BeOS, Darwin, FreeBSD, L'+
-  'inux)'#010+
-  '**2Xd_Do not use standard library search path (needed for cross compil'+
-  'e)'#010+
+  '**2Xc_Pass --shared/-dynamic to the linker (BeOS, Darwin, FreeBSD, Lin'+
+  'ux)'#010+
+  '**2Xd_Do not use standard library search path (needed ','for cross comp'+
+  'ile)'#010+
   '**2Xe_Use external linker'#010+
   '**2Xg_Create debuginfo in a separate file and add a debuglink section '+
-  'to ex','ecutable'#010+
+  'to executable'#010+
   '**2XD_Try to link units dynamically      (defines FPC_LINK_DYNAMIC)'#010+
   '**2Xi_Use internal linker'#010+
-  '**2Xm_Generate link map'#010+
+  '**2Xm_Generate li','nk map'#010+
   '**2XM<x>_Set the name of the '#039'main'#039' program routine (default i'+
   's '#039'main'#039')'#010+
-  '**2XP<x>_Prepend the binutils names with ','the prefix <x>'#010+
+  '**2XP<x>_Prepend the binutils names with the prefix <x>'#010+
   '**2Xr<x>_Set the linker'#039's rlink-path to <x> (needed for cross comp'+
-  'ile, see the ld manual for more information) (BeOS, Linux)'#010+
+  'ile, see the ld manual for more informa','tion) (BeOS, Linux)'#010+
   '**2XR<x>_Prepend <x> to all linker search paths (BeOS, Darwin, FreeBSD'+
   ', Linux, Mac OS, Solaris)'#010+
-  '**2X','s_Strip all symbols from executable'#010+
+  '**2Xs_Strip all symbols from executable'#010+
   '**2XS_Try to link units statically (default, defines FPC_LINK_STATIC)'#010+
-  '**2Xt_Link with static libraries (-static is passed to linker)'#010+
+  '**2Xt_Link wit','h static libraries (-static is passed to linker)'#010+
   '**2XX_Try to smartlink units             (defines FPC_LINK_SMART)'#010+
-  '**1*_',#010+
+  '**1*_'#010+
   '**1?_Show this help'#010+
   '**1h_Shows this help without waiting'
 );

compiler/pdecl.pas

@@ -333,85 +333,18 @@ implementation
 
     procedure types_dec(in_structure: boolean);
 
-      procedure get_cpp_class_external_status(od: tobjectdef);
-        var
-          hs: string;
-
-        begin
-          { C++ classes can be external -> all methods inside are external
-           (defined at the class level instead of per method, so that you cannot
-           define some methods as external and some not)
-          }
-          if (token=_ID) and
-             (idtoken=_EXTERNAL) then
-            begin
-              consume(_EXTERNAL);
-              { copied from pdecsub.pd_external }
-              if not(token=_SEMICOLON) and not(idtoken=_NAME) then
-                begin
-                  { Always add library prefix and suffix to create an uniform name }
-                  hs:=get_stringconst;
-                  if ExtractFileExt(hs)='' then
-                    hs:=ChangeFileExt(hs,target_info.sharedlibext);
-                  if Copy(hs,1,length(target_info.sharedlibprefix))<>target_info.sharedlibprefix then
-                    hs:=target_info.sharedlibprefix+hs;
-                  od.import_lib:=stringdup(hs);
-                end;
-              include(od.objectoptions, oo_is_external);
-              { check if we shall use another name for the class }
-              if (token=_ID) and
-                 (idtoken=_NAME) then
-                begin
-                  consume(_NAME);
-                  od.objextname:=stringdup(get_stringconst);
-                end
-              else
-                od.objextname:=stringdup(od.objrealname^);
-              consume(_SEMICOLON);
-              { now all methods need to be external }
-              od.make_all_methods_external;
-              include(od.objectoptions,oo_is_external);
-            end
-          else
-            od.objextname:=stringdup(od.objrealname^);
-          { ToDo: read the namespace of the class (influences the mangled name)}
-        end;
-
-      procedure get_objc_class_or_protocol_external_status(od: tobjectdef);
+      procedure finalize_objc_class_or_protocol_external_status(od: tobjectdef);
         begin
           { Objective-C classes can be external -> all messages inside are
             external (defined at the class level instead of per method, so
             that you cannot define some methods as external and some not)
           }
-          if (token=_ID) and
-             (idtoken=_EXTERNAL) then
+          if  [oo_is_external,oo_is_forward] <= od.objectoptions then
             begin
-              consume(_EXTERNAL);
-              if (token=_ID) and
-                 (idtoken=_NAME) and
-                 not(oo_is_forward in od.objectoptions) then
-                begin
-                  consume(_NAME);
-                  od.objextname:=stringdup(get_stringconst);
-                end
-              else
-                { the external name doesn't matter for formally declared
-                  classes, and allowing to specify one would mean that we would
-                  have to check it for consistency with the actual definition
-                  later on }
-                od.objextname:=stringdup(od.objrealname^);
-              consume(_SEMICOLON);
-              od.make_all_methods_external;
-              include(od.objectoptions,oo_is_external);
-              if (oo_is_forward in od.objectoptions) then
-                begin
-                  { formal definition: x = objcclass; external; }
-                  exclude(od.objectoptions,oo_is_forward);
-                  include(od.objectoptions,oo_is_formal);
-                end;
-            end
-          else { or also allow "public name 'x'"? }
-            od.objextname:=stringdup(od.objrealname^);
+              { formal definition: x = objcclass; external; }
+              exclude(od.objectoptions,oo_is_forward);
+              include(od.objectoptions,oo_is_formal);
+            end;
         end;
 
 
@@ -633,14 +566,11 @@ implementation
                     try_consume_hintdirective(newtype.symoptions,newtype.deprecatedmsg);
                     consume(_SEMICOLON);
 
-                    { we have to know whether the class or protocol is
-                      external before the vmt is built, because some errors/
-                      hints depend on this  }
+                    { change a forward and external objcclass declaration into
+                      formal external definition, so the compiler does not
+                      expect an real definition later }
                     if is_objc_class_or_protocol(hdef) then
-                      get_objc_class_or_protocol_external_status(tobjectdef(hdef));
-
-                    if is_cppclass(hdef) then
-                      get_cpp_class_external_status(tobjectdef(hdef));
+                      finalize_objc_class_or_protocol_external_status(tobjectdef(hdef));
 
                     { Build VMT indexes, skip for type renaming and forward classes }
                     if (hdef.typesym=newtype) and

compiler/pdecobj.pas

@@ -42,7 +42,7 @@ interface
 implementation
 
     uses
-      cutils,
+      sysutils,cutils,
       globals,verbose,systems,tokens,
       symbase,symsym,symtable,
       node,nld,nmem,ncon,ncnv,ncal,
@@ -344,23 +344,85 @@ implementation
         p.free;
       end;
 
-    procedure parse_object_options;
+    procedure get_cpp_class_external_status(od: tobjectdef);
+      var
+        hs: string;
       begin
-        if current_objectdef.objecttype in [odt_object,odt_class] then
+        { C++ classes can be external -> all methods inside are external
+         (defined at the class level instead of per method, so that you cannot
+         define some methods as external and some not)
+        }
+        if try_to_consume(_EXTERNAL) then
           begin
-            while true do
+            if token in [_CSTRING,_CWSTRING,_CCHAR,_CWCHAR] then
               begin
-                if try_to_consume(_ABSTRACT) then
-                  include(current_structdef.objectoptions,oo_is_abstract)
-                else
-                if try_to_consume(_SEALED) then
-                  include(current_structdef.objectoptions,oo_is_sealed)
-                else
-                  break;
+                { Always add library prefix and suffix to create an uniform name }
+                hs:=get_stringconst;
+                if ExtractFileExt(hs)='' then
+                  hs:=ChangeFileExt(hs,target_info.sharedlibext);
+                if Copy(hs,1,length(target_info.sharedlibprefix))<>target_info.sharedlibprefix then
+                  hs:=target_info.sharedlibprefix+hs;
+                od.import_lib:=stringdup(hs);
               end;
-            if [oo_is_abstract, oo_is_sealed] * current_structdef.objectoptions = [oo_is_abstract, oo_is_sealed] then
-              Message(parser_e_abstract_and_sealed_conflict);
-          end;
+            include(od.objectoptions, oo_is_external);
+            { check if we shall use another name for the class }
+            if try_to_consume(_NAME) then
+              od.objextname:=stringdup(get_stringconst)
+            else
+              od.objextname:=stringdup(od.objrealname^);
+            include(od.objectoptions,oo_is_external);
+          end
+        else
+          od.objextname:=stringdup(od.objrealname^);
+        { ToDo: read the namespace of the class (influences the mangled name)}
+      end;
+
+    procedure get_objc_class_or_protocol_external_status(od: tobjectdef);
+      begin
+        { Objective-C classes can be external -> all messages inside are
+          external (defined at the class level instead of per method, so
+          that you cannot define some methods as external and some not)
+        }
+        if try_to_consume(_EXTERNAL) then
+          begin
+            if try_to_consume(_NAME) then
+              od.objextname:=stringdup(get_stringconst)
+            else
+              { the external name doesn't matter for formally declared
+                classes, and allowing to specify one would mean that we would
+                have to check it for consistency with the actual definition
+                later on }
+              od.objextname:=stringdup(od.objrealname^);
+            include(od.objectoptions,oo_is_external);
+          end
+        else
+          od.objextname:=stringdup(od.objrealname^);
+      end;
+
+
+    procedure parse_object_options;
+      begin
+        case current_objectdef.objecttype of
+          odt_object,odt_class:
+            begin
+              while true do
+                begin
+                  if try_to_consume(_ABSTRACT) then
+                    include(current_structdef.objectoptions,oo_is_abstract)
+                  else
+                  if try_to_consume(_SEALED) then
+                    include(current_structdef.objectoptions,oo_is_sealed)
+                  else
+                    break;
+                end;
+              if [oo_is_abstract, oo_is_sealed] * current_structdef.objectoptions = [oo_is_abstract, oo_is_sealed] then
+                Message(parser_e_abstract_and_sealed_conflict);
+            end;
+          odt_cppclass:
+            get_cpp_class_external_status(current_objectdef);
+          odt_objcclass,odt_objcprotocol,odt_objccategory:
+            get_objc_class_or_protocol_external_status(current_objectdef);
+        end;
       end;
 
     procedure parse_parent_classes;
@@ -1039,6 +1101,13 @@ implementation
            (current_objectdef.objecttype in [odt_interfacecom,odt_class]) then
           include(current_structdef.objectoptions,oo_can_have_published);
 
+        { Objective-C objectdefs can be "formal definitions", in which case
+          the syntax is "type tc = objcclass external;" -> we have to parse
+          its object options (external) already here, to make sure that such
+          definitions are recognised as formal defs }
+        if objecttype in [odt_objcclass,odt_objcprotocol,odt_objccategory] then
+          parse_object_options;
+
         { forward def? }
         if not assigned(fd) and
            (token=_SEMICOLON) then
@@ -1057,7 +1126,8 @@ implementation
               end;
 
             { parse list of options (abstract / sealed) }
-            parse_object_options;
+            if not(objecttype in [odt_objcclass,odt_objcprotocol,odt_objccategory]) then
+              parse_object_options;
 
             { parse list of parent classes }
             parse_parent_classes;

compiler/pdecsub.pas

@@ -1661,7 +1661,11 @@ begin
   if not(is_class_or_interface_or_objc(tprocdef(pd).struct)) then
     Message(parser_e_no_object_override)
   else if is_objccategory(tprocdef(pd).struct) then
-    Message(parser_e_no_category_override);
+    Message(parser_e_no_category_override)
+  else if not is_objc_class_or_protocol(tprocdef(pd).struct) and
+          not is_cppclass(tprocdef(pd).struct) and
+          (po_external in pd.procoptions) then
+    Message1(parser_e_proc_dir_conflict,'OVERRIDE');
 end;
 
 procedure pd_overload(pd:tabstractprocdef);
@@ -1686,6 +1690,8 @@ begin
   { check parameter type }
   if not is_objc_class_or_protocol(tprocdef(pd).struct) then
     begin
+      if po_external in pd.procoptions then
+        Message1(parser_e_proc_dir_conflict,'MESSAGE');
       paracnt:=0;
       pd.parast.SymList.ForEachCall(@check_msg_para,@paracnt);
       if paracnt<>1 then
@@ -2210,7 +2216,7 @@ const
       pooption : []; { can be po_msgstr or po_msgint }
       mutexclpocall : [pocall_internproc];
       mutexclpotype : [potype_constructor,potype_destructor,potype_operator,potype_class_constructor,potype_class_destructor];
-      mutexclpo     : [po_interrupt,po_external,po_inline]
+      mutexclpo     : [po_interrupt,po_inline]
     ),(
       idtok:_MWPASCAL;
       pd_flags : [pd_interface,pd_implemen,pd_body,pd_procvar];
@@ -2255,7 +2261,7 @@ const
       pooption : [po_overridingmethod,po_virtualmethod];
       mutexclpocall : [pocall_internproc];
       mutexclpotype : [];
-      mutexclpo     : [po_exports,po_external,po_interrupt,po_virtualmethod,po_inline]
+      mutexclpo     : [po_exports,po_interrupt,po_virtualmethod,po_inline]
     ),(
       idtok:_PASCAL;
       pd_flags : [pd_interface,pd_implemen,pd_body,pd_procvar];
@@ -2855,6 +2861,13 @@ const
             include(pd.procoptions,po_global);
           end;
 
+        { methods from external class definitions are all external themselves }
+        if (pd.typ=procdef) and
+           assigned(tprocdef(pd).struct) and
+           (tprocdef(pd).struct.typ=objectdef) and
+           (oo_is_external in tobjectdef(tprocdef(pd).struct).objectoptions) then
+          tprocdef(pd).make_external;
+
         { Class constructors and destructor are static class methods in real. }
         { There are many places in the compiler where either class or static  }
         { method flag changes the behavior. It is simplier to add them to     }

compiler/symdef.pas

@@ -323,8 +323,6 @@ interface
           procedure register_maybe_created_object_type;
           procedure register_created_classref_type;
           procedure register_vmt_call(index:longint);
-          { ObjC & C++ }
-          procedure make_all_methods_external;
           { ObjC }
           procedure finish_objc_data;
           function check_objc_types: boolean;
@@ -565,6 +563,7 @@ interface
           function  objcmangledname : string;
           function  is_methodpointer:boolean;override;
           function  is_addressonly:boolean;override;
+          procedure make_external;
        end;
 
        { single linked list of overloaded procs }
@@ -3515,6 +3514,14 @@ implementation
                  not is_nested_pd(self));
       end;
 
+
+    procedure tprocdef.make_external;
+      begin
+        include(procoptions,po_external);
+        forwarddef:=false;
+      end;
+
+
     function tprocdef.GetSymtable(t:tGetSymtable):TSymtable;
       begin
         case t of
@@ -4957,24 +4964,6 @@ implementation
       end;
 
 
-    procedure make_procdef_external(data: tobject; arg: pointer);
-      var
-        def: tdef absolute data;
-      begin
-        if (def.typ = procdef) then
-          begin
-            include(tprocdef(def).procoptions,po_external);
-            tprocdef(def).forwarddef:=false;
-          end;
-      end;
-
-
-    procedure tobjectdef.make_all_methods_external;
-      begin
-         self.symtable.deflist.foreachcall(@make_procdef_external,nil);
-      end;
-
-
     procedure check_and_finish_msg(data: tobject; arg: pointer);
       var
         def: tdef absolute data;

compiler/symtable.pas

@@ -2092,6 +2092,12 @@ implementation
                    is_objcclass(ttypesym(srsym).typedef) and
                    not(oo_is_formal in tobjectdef(ttypesym(srsym).typedef).objectoptions) then
                   begin
+                    { the external name for the formal and the real definition must match }
+                    if tobjectdef(ttypesym(srsym).typedef).objextname^<>pd.objextname^ then
+                      begin
+                        Message2(sym_e_external_class_name_mismatch1,pd.objextname^,pd.typename);
+                        MessagePos1(srsym.fileinfo,sym_e_external_class_name_mismatch2,tobjectdef(ttypesym(srsym).typedef).objextname^);
+                      end;
                     result:=tobjectdef(ttypesym(srsym).typedef);
                     if assigned(current_procinfo) and
                        (srsym.owner.symtabletype=staticsymtable) then

packages/cocoaint/src/AnonClassDefinitionsCoredata.pas

@@ -9,217 +9,217 @@ unit AnonClassDefinitionsCoredata;
 interface
 
 type
-  Protocol = objcclass; external;
-  NSAffineTransform = objcclass; external;
-  NSData = objcclass; external;
-  NSAppleEventDescriptor = objcclass; external;
-  NSAppleEventManager = objcclass; external;
-  NSDictionary = objcclass; external;
-  NSString = objcclass; external;
-  NSURL = objcclass; external;
-  NSAppleScript = objcclass; external;
-  NSMutableData = objcclass; external;
-  NSMutableDictionary = objcclass; external;
-  NSMutableArray = objcclass; external;
-  NSArchiver = objcclass; external;
-  NSUnarchiver = objcclass; external;
-  NSIndexSet = objcclass; external;
-  NSArray = objcclass; external;
-  NSAttributedString = objcclass; external;
-  NSMutableAttributedString = objcclass; external;
-  NSAutoreleasePool = objcclass; external;
-  NSError = objcclass; external;
-  NSBundle = objcclass; external;
-  NSCache = objcclass; external;
-  NSDateComponents = objcclass; external;
-  NSLocale = objcclass; external;
-  NSTimeZone = objcclass; external;
-  NSCalendar = objcclass; external;
-  NSCalendarDate = objcclass; external;
-  NSCharacterSet = objcclass; external;
-  NSMutableCharacterSet = objcclass; external;
-  NSClassDescription = objcclass; external;
-  NSCoder = objcclass; external;
-  NSPredicateOperator = objcclass; external;
-  NSExpression = objcclass; external;
-  NSComparisonPredicate = objcclass; external;
-  NSCompoundPredicate = objcclass; external;
-  NSDistantObject = objcclass; external;
-  NSException = objcclass; external;
-  NSPort = objcclass; external;
-  NSRunLoop = objcclass; external;
-  NSPortNameServer = objcclass; external;
-  NSDistantObjectRequest = objcclass; external;
-  NSConnection = objcclass; external;
-  NSPurgeableData = objcclass; external;
-  NSDate = objcclass; external;
-  NSDateFormatter = objcclass; external;
-  NSDecimalNumber = objcclass; external;
-  NSDecimalNumberHandler = objcclass; external;
-  NSSet = objcclass; external;
-  NSDistributedLock = objcclass; external;
-  NSDistributedNotificationCenter = objcclass; external;
-  NSEnumerator = objcclass; external;
-  NSAssertionHandler = objcclass; external;
-  NSPredicate = objcclass; external;
-  NSFileHandle = objcclass; external;
-  NSPipe = objcclass; external;
-  NSDirectoryEnumerator = objcclass; external;
-  NSNumber = objcclass; external;
-  NSFileManager = objcclass; external;
-  NSFormatter = objcclass; external;
-  NSGarbageCollector = objcclass; external;
-  NSHashTable = objcclass; external;
-  NSHost = objcclass; external;
-  NSHTTPCookieInternal = objcclass; external;
-  NSHTTPCookie = objcclass; external;
-  NSHTTPCookieStorageInternal = objcclass; external;
-  NSHTTPCookieStorage = objcclass; external;
-  NSIndexPath = objcclass; external;
-  NSMutableIndexSet = objcclass; external;
-  NSMethodSignature = objcclass; external;
-  NSInvocation = objcclass; external;
-  NSKeyedArchiver = objcclass; external;
-  NSKeyedUnarchiver = objcclass; external;
-  NSLock = objcclass; external;
-  NSConditionLock = objcclass; external;
-  NSRecursiveLock = objcclass; external;
-  NSCondition = objcclass; external;
-  NSMapTable = objcclass; external;
-  NSMetadataItem = objcclass; external;
-  NSMetadataQueryAttributeValueTuple = objcclass; external;
-  NSMetadataQueryResultGroup = objcclass; external;
-  NSMetadataQuery = objcclass; external;
-  NSInputStream = objcclass; external;
-  NSOutputStream = objcclass; external;
-  NSNetService = objcclass; external;
-  NSNetServiceBrowser = objcclass; external;
-  NSOperationQueue = objcclass; external;
-  NSNotification = objcclass; external;
-  NSNotificationCenter = objcclass; external;
-  NSNotificationQueue = objcclass; external;
-  NSNull = objcclass; external;
-  NSNumberFormatter = objcclass; external;
-  NSObject = objcclass; external;
-  NSScriptObjectSpecifier = objcclass; external;
-  NSOperation = objcclass; external;
-  NSBlockOperation = objcclass; external;
-  NSInvocationOperation = objcclass; external;
-  NSOrthography = objcclass; external;
-  NSPointerArray = objcclass; external;
-  NSPointerFunctions = objcclass; external;
-  NSPortMessage = objcclass; external;
-  NSMachPort = objcclass; external;
-  NSMessagePort = objcclass; external;
-  NSSocketPort = objcclass; external;
-  NSPortCoder = objcclass; external;
-  NSMachBootstrapServer = objcclass; external;
-  NSMessagePortNameServer = objcclass; external;
-  NSSocketPortNameServer = objcclass; external;
-  NSProcessInfo = objcclass; external;
-  NSPropertyListSerialization = objcclass; external;
-  NSProtocolChecker = objcclass; external;
-  NSProxy = objcclass; external;
-  NSTimer = objcclass; external;
-  NSScanner = objcclass; external;
-  NSScriptCommandDescription = objcclass; external;
-  NSScriptClassDescription = objcclass; external;
-  NSScriptCoercionHandler = objcclass; external;
-  NSScriptCommand = objcclass; external;
-  NSScriptExecutionContext = objcclass; external;
-  NSScriptWhoseTest = objcclass; external;
-  NSIndexSpecifier = objcclass; external;
-  NSMiddleSpecifier = objcclass; external;
-  NSNameSpecifier = objcclass; external;
-  NSPositionalSpecifier = objcclass; external;
-  NSPropertySpecifier = objcclass; external;
-  NSRandomSpecifier = objcclass; external;
-  NSRangeSpecifier = objcclass; external;
-  NSRelativeSpecifier = objcclass; external;
-  NSUniqueIDSpecifier = objcclass; external;
-  NSWhoseSpecifier = objcclass; external;
-  NSCloneCommand = objcclass; external;
-  NSCloseCommand = objcclass; external;
-  NSCountCommand = objcclass; external;
-  NSCreateCommand = objcclass; external;
-  NSDeleteCommand = objcclass; external;
-  NSExistsCommand = objcclass; external;
-  NSGetCommand = objcclass; external;
-  NSMoveCommand = objcclass; external;
-  NSQuitCommand = objcclass; external;
-  NSSetCommand = objcclass; external;
-  NSMutableSet = objcclass; external;
-  NSScriptSuiteRegistry = objcclass; external;
-  NSLogicalTest = objcclass; external;
-  NSSpecifierTest = objcclass; external;
-  NSCountedSet = objcclass; external;
-  NSSortDescriptor = objcclass; external;
-  NSSpellServer = objcclass; external;
-  NSStream = objcclass; external;
-  NSMutableString = objcclass; external;
-  NSSimpleCString = objcclass; external;
-  NSConstantString = objcclass; external;
-  NSTask = objcclass; external;
-  NSTextCheckingResult = objcclass; external;
-  NSThread = objcclass; external;
-  NSUndoManager = objcclass; external;
-  NSURLAuthenticationChallenge = objcclass; external;
-  NSURLCredential = objcclass; external;
-  NSURLProtectionSpace = objcclass; external;
-  NSURLResponse = objcclass; external;
-  NSURLAuthenticationChallengeInternal = objcclass; external;
-  NSCachedURLResponseInternal = objcclass; external;
-  NSURLRequest = objcclass; external;
-  NSCachedURLResponse = objcclass; external;
-  NSURLCacheInternal = objcclass; external;
-  NSURLCache = objcclass; external;
-  NSURLConnectionInternal = objcclass; external;
-  NSURLConnection = objcclass; external;
-  NSURLCredentialInternal = objcclass; external;
-  NSURLCredentialStorageInternal = objcclass; external;
-  NSURLCredentialStorage = objcclass; external;
-  NSURLDownloadInternal = objcclass; external;
-  NSURLDownload = objcclass; external;
-  NSURLHandle = objcclass; external;
-  NSURLProtectionSpaceInternal = objcclass; external;
-  NSMutableURLRequest = objcclass; external;
-  NSURLProtocol = objcclass; external;
-  NSURLProtocolInternal = objcclass; external;
-  NSURLRequestInternal = objcclass; external;
-  NSURLResponseInternal = objcclass; external;
-  NSHTTPURLResponseInternal = objcclass; external;
-  NSHTTPURLResponse = objcclass; external;
-  NSUserDefaults = objcclass; external;
-  NSValue = objcclass; external;
-  NSValueTransformer = objcclass; external;
-  NSXMLDTD = objcclass; external;
-  NSXMLDocument = objcclass; external;
-  NSXMLDTDNode = objcclass; external;
-  NSXMLElement = objcclass; external;
-  NSXMLNode = objcclass; external;
-  NSXMLParser = objcclass; external;
-  NSAtomicStore = objcclass; external;
-  NSAtomicStoreCacheNode = objcclass; external;
-  NSEntityDescription = objcclass; external;
-  NSAttributeDescription = objcclass; external;
-  NSManagedObjectModel = objcclass; external;
-  NSManagedObjectContext = objcclass; external;
-  NSManagedObject = objcclass; external;
-  NSEntityMapping = objcclass; external;
-  NSMigrationManager = objcclass; external;
-  NSEntityMigrationPolicy = objcclass; external;
-  NSExpressionDescription = objcclass; external;
-  NSFetchRequest = objcclass; external;
-  NSFetchedPropertyDescription = objcclass; external;
-  NSFetchRequestExpression = objcclass; external;
-  NSManagedObjectID = objcclass; external;
-  NSPersistentStore = objcclass; external;
-  NSPersistentStoreCoordinator = objcclass; external;
-  NSMappingModel = objcclass; external;
-  NSMigrationContext = objcclass; external;
-  NSPropertyDescription = objcclass; external;
-  NSPropertyMapping = objcclass; external;
-  NSRelationshipDescription = objcclass; external;
+  Protocol = objcclass external;
+  NSAffineTransform = objcclass external;
+  NSData = objcclass external;
+  NSAppleEventDescriptor = objcclass external;
+  NSAppleEventManager = objcclass external;
+  NSDictionary = objcclass external;
+  NSString = objcclass external;
+  NSURL = objcclass external;
+  NSAppleScript = objcclass external;
+  NSMutableData = objcclass external;
+  NSMutableDictionary = objcclass external;
+  NSMutableArray = objcclass external;
+  NSArchiver = objcclass external;
+  NSUnarchiver = objcclass external;
+  NSIndexSet = objcclass external;
+  NSArray = objcclass external;
+  NSAttributedString = objcclass external;
+  NSMutableAttributedString = objcclass external;
+  NSAutoreleasePool = objcclass external;
+  NSError = objcclass external;
+  NSBundle = objcclass external;
+  NSCache = objcclass external;
+  NSDateComponents = objcclass external;
+  NSLocale = objcclass external;
+  NSTimeZone = objcclass external;
+  NSCalendar = objcclass external;
+  NSCalendarDate = objcclass external;
+  NSCharacterSet = objcclass external;
+  NSMutableCharacterSet = objcclass external;
+  NSClassDescription = objcclass external;
+  NSCoder = objcclass external;
+  NSPredicateOperator = objcclass external;
+  NSExpression = objcclass external;
+  NSComparisonPredicate = objcclass external;
+  NSCompoundPredicate = objcclass external;
+  NSDistantObject = objcclass external;
+  NSException = objcclass external;
+  NSPort = objcclass external;
+  NSRunLoop = objcclass external;
+  NSPortNameServer = objcclass external;
+  NSDistantObjectRequest = objcclass external;
+  NSConnection = objcclass external;
+  NSPurgeableData = objcclass external;
+  NSDate = objcclass external;
+  NSDateFormatter = objcclass external;
+  NSDecimalNumber = objcclass external;
+  NSDecimalNumberHandler = objcclass external;
+  NSSet = objcclass external;
+  NSDistributedLock = objcclass external;
+  NSDistributedNotificationCenter = objcclass external;
+  NSEnumerator = objcclass external;
+  NSAssertionHandler = objcclass external;
+  NSPredicate = objcclass external;
+  NSFileHandle = objcclass external;
+  NSPipe = objcclass external;
+  NSDirectoryEnumerator = objcclass external;
+  NSNumber = objcclass external;
+  NSFileManager = objcclass external;
+  NSFormatter = objcclass external;
+  NSGarbageCollector = objcclass external;
+  NSHashTable = objcclass external;
+  NSHost = objcclass external;
+  NSHTTPCookieInternal = objcclass external;
+  NSHTTPCookie = objcclass external;
+  NSHTTPCookieStorageInternal = objcclass external;
+  NSHTTPCookieStorage = objcclass external;
+  NSIndexPath = objcclass external;
+  NSMutableIndexSet = objcclass external;
+  NSMethodSignature = objcclass external;
+  NSInvocation = objcclass external;
+  NSKeyedArchiver = objcclass external;
+  NSKeyedUnarchiver = objcclass external;
+  NSLock = objcclass external;
+  NSConditionLock = objcclass external;
+  NSRecursiveLock = objcclass external;
+  NSCondition = objcclass external;
+  NSMapTable = objcclass external;
+  NSMetadataItem = objcclass external;
+  NSMetadataQueryAttributeValueTuple = objcclass external;
+  NSMetadataQueryResultGroup = objcclass external;
+  NSMetadataQuery = objcclass external;
+  NSInputStream = objcclass external;
+  NSOutputStream = objcclass external;
+  NSNetService = objcclass external;
+  NSNetServiceBrowser = objcclass external;
+  NSOperationQueue = objcclass external;
+  NSNotification = objcclass external;
+  NSNotificationCenter = objcclass external;
+  NSNotificationQueue = objcclass external;
+  NSNull = objcclass external;
+  NSNumberFormatter = objcclass external;
+  NSObject = objcclass external;
+  NSScriptObjectSpecifier = objcclass external;
+  NSOperation = objcclass external;
+  NSBlockOperation = objcclass external;
+  NSInvocationOperation = objcclass external;
+  NSOrthography = objcclass external;
+  NSPointerArray = objcclass external;
+  NSPointerFunctions = objcclass external;
+  NSPortMessage = objcclass external;
+  NSMachPort = objcclass external;
+  NSMessagePort = objcclass external;
+  NSSocketPort = objcclass external;
+  NSPortCoder = objcclass external;
+  NSMachBootstrapServer = objcclass external;
+  NSMessagePortNameServer = objcclass external;
+  NSSocketPortNameServer = objcclass external;
+  NSProcessInfo = objcclass external;
+  NSPropertyListSerialization = objcclass external;
+  NSProtocolChecker = objcclass external;
+  NSProxy = objcclass external;
+  NSTimer = objcclass external;
+  NSScanner = objcclass external;
+  NSScriptCommandDescription = objcclass external;
+  NSScriptClassDescription = objcclass external;
+  NSScriptCoercionHandler = objcclass external;
+  NSScriptCommand = objcclass external;
+  NSScriptExecutionContext = objcclass external;
+  NSScriptWhoseTest = objcclass external;
+  NSIndexSpecifier = objcclass external;
+  NSMiddleSpecifier = objcclass external;
+  NSNameSpecifier = objcclass external;
+  NSPositionalSpecifier = objcclass external;
+  NSPropertySpecifier = objcclass external;
+  NSRandomSpecifier = objcclass external;
+  NSRangeSpecifier = objcclass external;
+  NSRelativeSpecifier = objcclass external;
+  NSUniqueIDSpecifier = objcclass external;
+  NSWhoseSpecifier = objcclass external;
+  NSCloneCommand = objcclass external;
+  NSCloseCommand = objcclass external;
+  NSCountCommand = objcclass external;
+  NSCreateCommand = objcclass external;
+  NSDeleteCommand = objcclass external;
+  NSExistsCommand = objcclass external;
+  NSGetCommand = objcclass external;
+  NSMoveCommand = objcclass external;
+  NSQuitCommand = objcclass external;
+  NSSetCommand = objcclass external;
+  NSMutableSet = objcclass external;
+  NSScriptSuiteRegistry = objcclass external;
+  NSLogicalTest = objcclass external;
+  NSSpecifierTest = objcclass external;
+  NSCountedSet = objcclass external;
+  NSSortDescriptor = objcclass external;
+  NSSpellServer = objcclass external;
+  NSStream = objcclass external;
+  NSMutableString = objcclass external;
+  NSSimpleCString = objcclass external;
+  NSConstantString = objcclass external;
+  NSTask = objcclass external;
+  NSTextCheckingResult = objcclass external;
+  NSThread = objcclass external;
+  NSUndoManager = objcclass external;
+  NSURLAuthenticationChallenge = objcclass external;
+  NSURLCredential = objcclass external;
+  NSURLProtectionSpace = objcclass external;
+  NSURLResponse = objcclass external;
+  NSURLAuthenticationChallengeInternal = objcclass external;
+  NSCachedURLResponseInternal = objcclass external;
+  NSURLRequest = objcclass external;
+  NSCachedURLResponse = objcclass external;
+  NSURLCacheInternal = objcclass external;
+  NSURLCache = objcclass external;
+  NSURLConnectionInternal = objcclass external;
+  NSURLConnection = objcclass external;
+  NSURLCredentialInternal = objcclass external;
+  NSURLCredentialStorageInternal = objcclass external;
+  NSURLCredentialStorage = objcclass external;
+  NSURLDownloadInternal = objcclass external;
+  NSURLDownload = objcclass external;
+  NSURLHandle = objcclass external;
+  NSURLProtectionSpaceInternal = objcclass external;
+  NSMutableURLRequest = objcclass external;
+  NSURLProtocol = objcclass external;
+  NSURLProtocolInternal = objcclass external;
+  NSURLRequestInternal = objcclass external;
+  NSURLResponseInternal = objcclass external;
+  NSHTTPURLResponseInternal = objcclass external;
+  NSHTTPURLResponse = objcclass external;
+  NSUserDefaults = objcclass external;
+  NSValue = objcclass external;
+  NSValueTransformer = objcclass external;
+  NSXMLDTD = objcclass external;
+  NSXMLDocument = objcclass external;
+  NSXMLDTDNode = objcclass external;
+  NSXMLElement = objcclass external;
+  NSXMLNode = objcclass external;
+  NSXMLParser = objcclass external;
+  NSAtomicStore = objcclass external;
+  NSAtomicStoreCacheNode = objcclass external;
+  NSEntityDescription = objcclass external;
+  NSAttributeDescription = objcclass external;
+  NSManagedObjectModel = objcclass external;
+  NSManagedObjectContext = objcclass external;
+  NSManagedObject = objcclass external;
+  NSEntityMapping = objcclass external;
+  NSMigrationManager = objcclass external;
+  NSEntityMigrationPolicy = objcclass external;
+  NSExpressionDescription = objcclass external;
+  NSFetchRequest = objcclass external;
+  NSFetchedPropertyDescription = objcclass external;
+  NSFetchRequestExpression = objcclass external;
+  NSManagedObjectID = objcclass external;
+  NSPersistentStore = objcclass external;
+  NSPersistentStoreCoordinator = objcclass external;
+  NSMappingModel = objcclass external;
+  NSMigrationContext = objcclass external;
+  NSPropertyDescription = objcclass external;
+  NSPropertyMapping = objcclass external;
+  NSRelationshipDescription = objcclass external;
 
 implementation
 

packages/cocoaint/src/AnonClassDefinitionsQuartzcore.pas

@@ -9,415 +9,415 @@ unit AnonClassDefinitionsQuartzcore;
 interface
 
 type
-  Protocol = objcclass; external;
-  NSAffineTransform = objcclass; external;
-  NSData = objcclass; external;
-  NSAppleEventDescriptor = objcclass; external;
-  NSAppleEventManager = objcclass; external;
-  NSDictionary = objcclass; external;
-  NSString = objcclass; external;
-  NSURL = objcclass; external;
-  NSAppleScript = objcclass; external;
-  NSMutableData = objcclass; external;
-  NSMutableDictionary = objcclass; external;
-  NSMutableArray = objcclass; external;
-  NSArchiver = objcclass; external;
-  NSUnarchiver = objcclass; external;
-  NSIndexSet = objcclass; external;
-  NSArray = objcclass; external;
-  NSAttributedString = objcclass; external;
-  NSMutableAttributedString = objcclass; external;
-  NSAutoreleasePool = objcclass; external;
-  NSError = objcclass; external;
-  NSBundle = objcclass; external;
-  NSCache = objcclass; external;
-  NSDateComponents = objcclass; external;
-  NSLocale = objcclass; external;
-  NSTimeZone = objcclass; external;
-  NSCalendar = objcclass; external;
-  NSCalendarDate = objcclass; external;
-  NSCharacterSet = objcclass; external;
-  NSMutableCharacterSet = objcclass; external;
-  NSClassDescription = objcclass; external;
-  NSCoder = objcclass; external;
-  NSPredicateOperator = objcclass; external;
-  NSExpression = objcclass; external;
-  NSComparisonPredicate = objcclass; external;
-  NSCompoundPredicate = objcclass; external;
-  NSDistantObject = objcclass; external;
-  NSException = objcclass; external;
-  NSPort = objcclass; external;
-  NSRunLoop = objcclass; external;
-  NSPortNameServer = objcclass; external;
-  NSDistantObjectRequest = objcclass; external;
-  NSConnection = objcclass; external;
-  NSPurgeableData = objcclass; external;
-  NSDate = objcclass; external;
-  NSDateFormatter = objcclass; external;
-  NSDecimalNumber = objcclass; external;
-  NSDecimalNumberHandler = objcclass; external;
-  NSSet = objcclass; external;
-  NSDistributedLock = objcclass; external;
-  NSDistributedNotificationCenter = objcclass; external;
-  NSEnumerator = objcclass; external;
-  NSAssertionHandler = objcclass; external;
-  NSPredicate = objcclass; external;
-  NSFileHandle = objcclass; external;
-  NSPipe = objcclass; external;
-  NSDirectoryEnumerator = objcclass; external;
-  NSNumber = objcclass; external;
-  NSFileManager = objcclass; external;
-  NSFormatter = objcclass; external;
-  NSGarbageCollector = objcclass; external;
-  NSHashTable = objcclass; external;
-  NSHost = objcclass; external;
-  NSHTTPCookieInternal = objcclass; external;
-  NSHTTPCookie = objcclass; external;
-  NSHTTPCookieStorageInternal = objcclass; external;
-  NSHTTPCookieStorage = objcclass; external;
-  NSIndexPath = objcclass; external;
-  NSMutableIndexSet = objcclass; external;
-  NSMethodSignature = objcclass; external;
-  NSInvocation = objcclass; external;
-  NSKeyedArchiver = objcclass; external;
-  NSKeyedUnarchiver = objcclass; external;
-  NSLock = objcclass; external;
-  NSConditionLock = objcclass; external;
-  NSRecursiveLock = objcclass; external;
-  NSCondition = objcclass; external;
-  NSMapTable = objcclass; external;
-  NSMetadataItem = objcclass; external;
-  NSMetadataQueryAttributeValueTuple = objcclass; external;
-  NSMetadataQueryResultGroup = objcclass; external;
-  NSMetadataQuery = objcclass; external;
-  NSInputStream = objcclass; external;
-  NSOutputStream = objcclass; external;
-  NSNetService = objcclass; external;
-  NSNetServiceBrowser = objcclass; external;
-  NSOperationQueue = objcclass; external;
-  NSNotification = objcclass; external;
-  NSNotificationCenter = objcclass; external;
-  NSNotificationQueue = objcclass; external;
-  NSNull = objcclass; external;
-  NSNumberFormatter = objcclass; external;
-  NSObject = objcclass; external;
-  NSScriptObjectSpecifier = objcclass; external;
-  NSOperation = objcclass; external;
-  NSBlockOperation = objcclass; external;
-  NSInvocationOperation = objcclass; external;
-  NSOrthography = objcclass; external;
-  NSPointerArray = objcclass; external;
-  NSPointerFunctions = objcclass; external;
-  NSPortMessage = objcclass; external;
-  NSMachPort = objcclass; external;
-  NSMessagePort = objcclass; external;
-  NSSocketPort = objcclass; external;
-  NSPortCoder = objcclass; external;
-  NSMachBootstrapServer = objcclass; external;
-  NSMessagePortNameServer = objcclass; external;
-  NSSocketPortNameServer = objcclass; external;
-  NSProcessInfo = objcclass; external;
-  NSPropertyListSerialization = objcclass; external;
-  NSProtocolChecker = objcclass; external;
-  NSProxy = objcclass; external;
-  NSTimer = objcclass; external;
-  NSScanner = objcclass; external;
-  NSScriptCommandDescription = objcclass; external;
-  NSScriptClassDescription = objcclass; external;
-  NSScriptCoercionHandler = objcclass; external;
-  NSScriptCommand = objcclass; external;
-  NSScriptExecutionContext = objcclass; external;
-  NSScriptWhoseTest = objcclass; external;
-  NSIndexSpecifier = objcclass; external;
-  NSMiddleSpecifier = objcclass; external;
-  NSNameSpecifier = objcclass; external;
-  NSPositionalSpecifier = objcclass; external;
-  NSPropertySpecifier = objcclass; external;
-  NSRandomSpecifier = objcclass; external;
-  NSRangeSpecifier = objcclass; external;
-  NSRelativeSpecifier = objcclass; external;
-  NSUniqueIDSpecifier = objcclass; external;
-  NSWhoseSpecifier = objcclass; external;
-  NSCloneCommand = objcclass; external;
-  NSCloseCommand = objcclass; external;
-  NSCountCommand = objcclass; external;
-  NSCreateCommand = objcclass; external;
-  NSDeleteCommand = objcclass; external;
-  NSExistsCommand = objcclass; external;
-  NSGetCommand = objcclass; external;
-  NSMoveCommand = objcclass; external;
-  NSQuitCommand = objcclass; external;
-  NSSetCommand = objcclass; external;
-  NSMutableSet = objcclass; external;
-  NSScriptSuiteRegistry = objcclass; external;
-  NSLogicalTest = objcclass; external;
-  NSSpecifierTest = objcclass; external;
-  NSCountedSet = objcclass; external;
-  NSSortDescriptor = objcclass; external;
-  NSSpellServer = objcclass; external;
-  NSStream = objcclass; external;
-  NSMutableString = objcclass; external;
-  NSSimpleCString = objcclass; external;
-  NSConstantString = objcclass; external;
-  NSTask = objcclass; external;
-  NSTextCheckingResult = objcclass; external;
-  NSThread = objcclass; external;
-  NSUndoManager = objcclass; external;
-  NSURLAuthenticationChallenge = objcclass; external;
-  NSURLCredential = objcclass; external;
-  NSURLProtectionSpace = objcclass; external;
-  NSURLResponse = objcclass; external;
-  NSURLAuthenticationChallengeInternal = objcclass; external;
-  NSCachedURLResponseInternal = objcclass; external;
-  NSURLRequest = objcclass; external;
-  NSCachedURLResponse = objcclass; external;
-  NSURLCacheInternal = objcclass; external;
-  NSURLCache = objcclass; external;
-  NSURLConnectionInternal = objcclass; external;
-  NSURLConnection = objcclass; external;
-  NSURLCredentialInternal = objcclass; external;
-  NSURLCredentialStorageInternal = objcclass; external;
-  NSURLCredentialStorage = objcclass; external;
-  NSURLDownloadInternal = objcclass; external;
-  NSURLDownload = objcclass; external;
-  NSURLHandle = objcclass; external;
-  NSURLProtectionSpaceInternal = objcclass; external;
-  NSMutableURLRequest = objcclass; external;
-  NSURLProtocol = objcclass; external;
-  NSURLProtocolInternal = objcclass; external;
-  NSURLRequestInternal = objcclass; external;
-  NSURLResponseInternal = objcclass; external;
-  NSHTTPURLResponseInternal = objcclass; external;
-  NSHTTPURLResponse = objcclass; external;
-  NSUserDefaults = objcclass; external;
-  NSValue = objcclass; external;
-  NSValueTransformer = objcclass; external;
-  NSXMLDTD = objcclass; external;
-  NSXMLDocument = objcclass; external;
-  NSXMLDTDNode = objcclass; external;
-  NSXMLElement = objcclass; external;
-  NSXMLNode = objcclass; external;
-  NSXMLParser = objcclass; external;
-  NSActionCell = objcclass; external;
-  NSBezierPath = objcclass; external;
-  NSTextField = objcclass; external;
-  NSPanel = objcclass; external;
-  NSWindow = objcclass; external;
-  NSImage = objcclass; external;
-  NSButton = objcclass; external;
-  NSAlert = objcclass; external;
-  NSGraphicsContext = objcclass; external;
-  NSAnimation = objcclass; external;
-  NSViewAnimation = objcclass; external;
-  NSAnimationContext = objcclass; external;
-  NSPasteboard = objcclass; external;
-  NSDockTile = objcclass; external;
-  NSApplication = objcclass; external;
-  NSArrayController = objcclass; external;
-  NSATSTypesetter = objcclass; external;
-  NSFileWrapper = objcclass; external;
-  NSTextBlock = objcclass; external;
-  NSTextTable = objcclass; external;
-  NSTextList = objcclass; external;
-  CIImage = objcclass; external;
-  NSColor = objcclass; external;
-  NSColorSpace = objcclass; external;
-  NSBitmapImageRep = objcclass; external;
-  NSFont = objcclass; external;
-  NSBox = objcclass; external;
-  NSMatrix = objcclass; external;
-  NSScroller = objcclass; external;
-  NSBrowser = objcclass; external;
-  NSBrowserCell = objcclass; external;
-  NSSound = objcclass; external;
-  NSButtonCell = objcclass; external;
-  NSCachedImageRep = objcclass; external;
-  NSEvent = objcclass; external;
-  NSMenu = objcclass; external;
-  NSText = objcclass; external;
-  NSView = objcclass; external;
-  NSTextView = objcclass; external;
-  NSCell = objcclass; external;
-  NSCIImageRep = objcclass; external;
-  NSClipView = objcclass; external;
-  NSCollectionView = objcclass; external;
-  NSNib = objcclass; external;
-  NSCollectionViewItem = objcclass; external;
-  NSColorList = objcclass; external;
-  NSColorPanel = objcclass; external;
-  NSColorPicker = objcclass; external;
-  NSColorWell = objcclass; external;
-  NSComboBox = objcclass; external;
-  NSTableView = objcclass; external;
-  NSComboBoxCell = objcclass; external;
-  NSControl = objcclass; external;
-  NSController = objcclass; external;
-  NSCursor = objcclass; external;
-  NSCustomImageRep = objcclass; external;
-  NSDatePicker = objcclass; external;
-  NSDatePickerCell = objcclass; external;
-  NSDictionaryController = objcclass; external;
-  NSMenuItem = objcclass; external;
-  NSPageLayout = objcclass; external;
-  NSPrintInfo = objcclass; external;
-  NSPrintOperation = objcclass; external;
-  NSSavePanel = objcclass; external;
-  NSWindowController = objcclass; external;
-  NSDocument = objcclass; external;
-  NSOpenPanel = objcclass; external;
-  NSDocumentController = objcclass; external;
-  NSDrawer = objcclass; external;
-  NSPDFImageRep = objcclass; external;
-  NSEPSImageRep = objcclass; external;
-  NSTrackingArea = objcclass; external;
-  NSFontDescriptor = objcclass; external;
-  NSFontPanel = objcclass; external;
-  NSFontManager = objcclass; external;
-  NSFormCell = objcclass; external;
-  NSGlyphGenerator = objcclass; external;
-  NSGlyphInfo = objcclass; external;
-  NSGradient = objcclass; external;
-  CIContext = objcclass; external;
-  NSHelpManager = objcclass; external;
-  NSImageRep = objcclass; external;
-  _NSImageAuxiliary = objcclass; external;
-  NSImageCell = objcclass; external;
-  NSImageView = objcclass; external;
-  NSInputServer = objcclass; external;
-  NSInputManager = objcclass; external;
-  NSTextStorage = objcclass; external;
-  NSTypesetter = objcclass; external;
-  NSTextContainer = objcclass; external;
-  NSRulerView = objcclass; external;
-  NSParagraphStyle = objcclass; external;
-  NSRulerMarker = objcclass; external;
-  NSTabWell = objcclass; external;
-  NSStorage = objcclass; external;
-  NSRunStorage = objcclass; external;
-  NSSortedArray = objcclass; external;
-  NSLayoutManager = objcclass; external;
-  NSLevelIndicator = objcclass; external;
-  NSLevelIndicatorCell = objcclass; external;
-  NSMenuView = objcclass; external;
-  NSMenuItemCell = objcclass; external;
-  NSScreen = objcclass; external;
-  QTMovie = objcclass; external;
-  NSMovie = objcclass; external;
-  NSMovieView = objcclass; external;
-  NSIBObjectData = objcclass; external;
-  NSNibConnector = objcclass; external;
-  NSNibControlConnector = objcclass; external;
-  NSNibOutletConnector = objcclass; external;
-  NSManagedObjectContext = objcclass; external;
-  NSFetchRequest = objcclass; external;
-  NSObjectController = objcclass; external;
-  NSOpenGLPixelFormat = objcclass; external;
-  NSOpenGLPixelBuffer = objcclass; external;
-  NSOpenGLContext = objcclass; external;
-  NSOpenGLLayer = objcclass; external;
-  NSOpenGLView = objcclass; external;
-  NSTableHeaderView = objcclass; external;
-  NSTableColumn = objcclass; external;
-  NSMouseTracker = objcclass; external;
-  NSOutlineView = objcclass; external;
-  NSViewController = objcclass; external;
-  NSTextTab = objcclass; external;
-  NSMutableParagraphStyle = objcclass; external;
-  NSPasteboardItem = objcclass; external;
-  NSPathComponentCell = objcclass; external;
-  NSPopUpButtonCell = objcclass; external;
-  NSPathCell = objcclass; external;
-  NSPathControl = objcclass; external;
-  NSManagedObjectModel = objcclass; external;
-  NSPersistentDocument = objcclass; external;
-  NSPICTImageRep = objcclass; external;
-  NSPopUpButton = objcclass; external;
-  NSPredicateTemplate = objcclass; external;
-  NSPredicateEditor = objcclass; external;
-  NSEntityDescription = objcclass; external;
-  NSPredicateEditorRowTemplate = objcclass; external;
-  NSPrinter = objcclass; external;
-  NSPrintPanel = objcclass; external;
-  NSProgressIndicator = objcclass; external;
-  NSQuickDrawView = objcclass; external;
-  NSResponder = objcclass; external;
-  NSRuleEditor = objcclass; external;
-  NSScrollView = objcclass; external;
-  NSRunningApplication = objcclass; external;
-  NSNavView = objcclass; external;
-  NSSavePanelAuxiliary = objcclass; external;
-  NSSearchField = objcclass; external;
-  NSSearchFieldCell = objcclass; external;
-  NSSecureTextField = objcclass; external;
-  NSSecureTextFieldCell = objcclass; external;
-  NSSegmentedCell = objcclass; external;
-  NSSegmentedControl = objcclass; external;
-  NSShadow = objcclass; external;
-  NSSimpleHorizontalTypesetter = objcclass; external;
-  NSSlider = objcclass; external;
-  NSSliderCell = objcclass; external;
-  NSSpeechRecognizer = objcclass; external;
-  NSSpeechSynthesizer = objcclass; external;
-  NSSpellChecker = objcclass; external;
-  NSSplitView = objcclass; external;
-  NSStatusItem = objcclass; external;
-  NSStatusBar = objcclass; external;
-  NSStepper = objcclass; external;
-  NSStepperCell = objcclass; external;
-  NSTableHeaderCell = objcclass; external;
-  NSTabViewItem = objcclass; external;
-  NSTabView = objcclass; external;
-  NSTextAttachment = objcclass; external;
-  NSTextAttachmentCell = objcclass; external;
-  NSTextFieldCell = objcclass; external;
-  NSTextInputContext = objcclass; external;
-  NSTextTableBlock = objcclass; external;
-  NSTokenField = objcclass; external;
-  NSTokenFieldCell = objcclass; external;
-  NSToolbarItem = objcclass; external;
-  NSToolbar = objcclass; external;
-  NSToolbarItemViewer = objcclass; external;
-  NSToolbarItemGroup = objcclass; external;
-  NSTouch = objcclass; external;
-  NSTreeNode = objcclass; external;
-  NSTreeController = objcclass; external;
-  NSUserDefaultsController = objcclass; external;
-  CIFilter = objcclass; external;
-  CALayer = objcclass; external;
-  _NSViewAuxiliary = objcclass; external;
-  NSWindowAuxiliary = objcclass; external;
-  NSWorkspace = objcclass; external;
-  CAMediaTimingFunction = objcclass; external;
-  CAValueFunction = objcclass; external;
-  CAAnimation = objcclass; external;
-  CAPropertyAnimation = objcclass; external;
-  CABasicAnimation = objcclass; external;
-  CAKeyframeAnimation = objcclass; external;
-  CATransition = objcclass; external;
-  CAAnimationGroup = objcclass; external;
-  CAConstraint = objcclass; external;
-  CAConstraintLayoutManager = objcclass; external;
-  CAEmitterCell = objcclass; external;
-  CAEmitterLayer = objcclass; external;
-  CAGradientLayer = objcclass; external;
-  CALayerArray = objcclass; external;
-  CAOpenGLLayer = objcclass; external;
-  CARenderer = objcclass; external;
-  CAReplicatorLayer = objcclass; external;
-  CAScrollLayer = objcclass; external;
-  CAShapeLayer = objcclass; external;
-  CATextLayer = objcclass; external;
-  CATiledLayer = objcclass; external;
-  CATransaction = objcclass; external;
-  CATransformLayer = objcclass; external;
-  CIColor = objcclass; external;
-  CIKernel = objcclass; external;
-  CIFilterGenerator = objcclass; external;
-  CIFilterShape = objcclass; external;
-  CIImageAccumulator = objcclass; external;
-  CIPlugIn = objcclass; external;
-  CISampler = objcclass; external;
-  CIVector = objcclass; external;
+  Protocol = objcclass external;
+  NSAffineTransform = objcclass external;
+  NSData = objcclass external;
+  NSAppleEventDescriptor = objcclass external;
+  NSAppleEventManager = objcclass external;
+  NSDictionary = objcclass external;
+  NSString = objcclass external;
+  NSURL = objcclass external;
+  NSAppleScript = objcclass external;
+  NSMutableData = objcclass external;
+  NSMutableDictionary = objcclass external;
+  NSMutableArray = objcclass external;
+  NSArchiver = objcclass external;
+  NSUnarchiver = objcclass external;
+  NSIndexSet = objcclass external;
+  NSArray = objcclass external;
+  NSAttributedString = objcclass external;
+  NSMutableAttributedString = objcclass external;
+  NSAutoreleasePool = objcclass external;
+  NSError = objcclass external;
+  NSBundle = objcclass external;
+  NSCache = objcclass external;
+  NSDateComponents = objcclass external;
+  NSLocale = objcclass external;
+  NSTimeZone = objcclass external;
+  NSCalendar = objcclass external;
+  NSCalendarDate = objcclass external;
+  NSCharacterSet = objcclass external;
+  NSMutableCharacterSet = objcclass external;
+  NSClassDescription = objcclass external;
+  NSCoder = objcclass external;
+  NSPredicateOperator = objcclass external;
+  NSExpression = objcclass external;
+  NSComparisonPredicate = objcclass external;
+  NSCompoundPredicate = objcclass external;
+  NSDistantObject = objcclass external;
+  NSException = objcclass external;
+  NSPort = objcclass external;
+  NSRunLoop = objcclass external;
+  NSPortNameServer = objcclass external;
+  NSDistantObjectRequest = objcclass external;
+  NSConnection = objcclass external;
+  NSPurgeableData = objcclass external;
+  NSDate = objcclass external;
+  NSDateFormatter = objcclass external;
+  NSDecimalNumber = objcclass external;
+  NSDecimalNumberHandler = objcclass external;
+  NSSet = objcclass external;
+  NSDistributedLock = objcclass external;
+  NSDistributedNotificationCenter = objcclass external;
+  NSEnumerator = objcclass external;
+  NSAssertionHandler = objcclass external;
+  NSPredicate = objcclass external;
+  NSFileHandle = objcclass external;
+  NSPipe = objcclass external;
+  NSDirectoryEnumerator = objcclass external;
+  NSNumber = objcclass external;
+  NSFileManager = objcclass external;
+  NSFormatter = objcclass external;
+  NSGarbageCollector = objcclass external;
+  NSHashTable = objcclass external;
+  NSHost = objcclass external;
+  NSHTTPCookieInternal = objcclass external;
+  NSHTTPCookie = objcclass external;
+  NSHTTPCookieStorageInternal = objcclass external;
+  NSHTTPCookieStorage = objcclass external;
+  NSIndexPath = objcclass external;
+  NSMutableIndexSet = objcclass external;
+  NSMethodSignature = objcclass external;
+  NSInvocation = objcclass external;
+  NSKeyedArchiver = objcclass external;
+  NSKeyedUnarchiver = objcclass external;
+  NSLock = objcclass external;
+  NSConditionLock = objcclass external;
+  NSRecursiveLock = objcclass external;
+  NSCondition = objcclass external;
+  NSMapTable = objcclass external;
+  NSMetadataItem = objcclass external;
+  NSMetadataQueryAttributeValueTuple = objcclass external;
+  NSMetadataQueryResultGroup = objcclass external;
+  NSMetadataQuery = objcclass external;
+  NSInputStream = objcclass external;
+  NSOutputStream = objcclass external;
+  NSNetService = objcclass external;
+  NSNetServiceBrowser = objcclass external;
+  NSOperationQueue = objcclass external;
+  NSNotification = objcclass external;
+  NSNotificationCenter = objcclass external;
+  NSNotificationQueue = objcclass external;
+  NSNull = objcclass external;
+  NSNumberFormatter = objcclass external;
+  NSObject = objcclass external;
+  NSScriptObjectSpecifier = objcclass external;
+  NSOperation = objcclass external;
+  NSBlockOperation = objcclass external;
+  NSInvocationOperation = objcclass external;
+  NSOrthography = objcclass external;
+  NSPointerArray = objcclass external;
+  NSPointerFunctions = objcclass external;
+  NSPortMessage = objcclass external;
+  NSMachPort = objcclass external;
+  NSMessagePort = objcclass external;
+  NSSocketPort = objcclass external;
+  NSPortCoder = objcclass external;
+  NSMachBootstrapServer = objcclass external;
+  NSMessagePortNameServer = objcclass external;
+  NSSocketPortNameServer = objcclass external;
+  NSProcessInfo = objcclass external;
+  NSPropertyListSerialization = objcclass external;
+  NSProtocolChecker = objcclass external;
+  NSProxy = objcclass external;
+  NSTimer = objcclass external;
+  NSScanner = objcclass external;
+  NSScriptCommandDescription = objcclass external;
+  NSScriptClassDescription = objcclass external;
+  NSScriptCoercionHandler = objcclass external;
+  NSScriptCommand = objcclass external;
+  NSScriptExecutionContext = objcclass external;
+  NSScriptWhoseTest = objcclass external;
+  NSIndexSpecifier = objcclass external;
+  NSMiddleSpecifier = objcclass external;
+  NSNameSpecifier = objcclass external;
+  NSPositionalSpecifier = objcclass external;
+  NSPropertySpecifier = objcclass external;
+  NSRandomSpecifier = objcclass external;
+  NSRangeSpecifier = objcclass external;
+  NSRelativeSpecifier = objcclass external;
+  NSUniqueIDSpecifier = objcclass external;
+  NSWhoseSpecifier = objcclass external;
+  NSCloneCommand = objcclass external;
+  NSCloseCommand = objcclass external;
+  NSCountCommand = objcclass external;
+  NSCreateCommand = objcclass external;
+  NSDeleteCommand = objcclass external;
+  NSExistsCommand = objcclass external;
+  NSGetCommand = objcclass external;
+  NSMoveCommand = objcclass external;
+  NSQuitCommand = objcclass external;
+  NSSetCommand = objcclass external;
+  NSMutableSet = objcclass external;
+  NSScriptSuiteRegistry = objcclass external;
+  NSLogicalTest = objcclass external;
+  NSSpecifierTest = objcclass external;
+  NSCountedSet = objcclass external;
+  NSSortDescriptor = objcclass external;
+  NSSpellServer = objcclass external;
+  NSStream = objcclass external;
+  NSMutableString = objcclass external;
+  NSSimpleCString = objcclass external;
+  NSConstantString = objcclass external;
+  NSTask = objcclass external;
+  NSTextCheckingResult = objcclass external;
+  NSThread = objcclass external;
+  NSUndoManager = objcclass external;
+  NSURLAuthenticationChallenge = objcclass external;
+  NSURLCredential = objcclass external;
+  NSURLProtectionSpace = objcclass external;
+  NSURLResponse = objcclass external;
+  NSURLAuthenticationChallengeInternal = objcclass external;
+  NSCachedURLResponseInternal = objcclass external;
+  NSURLRequest = objcclass external;
+  NSCachedURLResponse = objcclass external;
+  NSURLCacheInternal = objcclass external;
+  NSURLCache = objcclass external;
+  NSURLConnectionInternal = objcclass external;
+  NSURLConnection = objcclass external;
+  NSURLCredentialInternal = objcclass external;
+  NSURLCredentialStorageInternal = objcclass external;
+  NSURLCredentialStorage = objcclass external;
+  NSURLDownloadInternal = objcclass external;
+  NSURLDownload = objcclass external;
+  NSURLHandle = objcclass external;
+  NSURLProtectionSpaceInternal = objcclass external;
+  NSMutableURLRequest = objcclass external;
+  NSURLProtocol = objcclass external;
+  NSURLProtocolInternal = objcclass external;
+  NSURLRequestInternal = objcclass external;
+  NSURLResponseInternal = objcclass external;
+  NSHTTPURLResponseInternal = objcclass external;
+  NSHTTPURLResponse = objcclass external;
+  NSUserDefaults = objcclass external;
+  NSValue = objcclass external;
+  NSValueTransformer = objcclass external;
+  NSXMLDTD = objcclass external;
+  NSXMLDocument = objcclass external;
+  NSXMLDTDNode = objcclass external;
+  NSXMLElement = objcclass external;
+  NSXMLNode = objcclass external;
+  NSXMLParser = objcclass external;
+  NSActionCell = objcclass external;
+  NSBezierPath = objcclass external;
+  NSTextField = objcclass external;
+  NSPanel = objcclass external;
+  NSWindow = objcclass external;
+  NSImage = objcclass external;
+  NSButton = objcclass external;
+  NSAlert = objcclass external;
+  NSGraphicsContext = objcclass external;
+  NSAnimation = objcclass external;
+  NSViewAnimation = objcclass external;
+  NSAnimationContext = objcclass external;
+  NSPasteboard = objcclass external;
+  NSDockTile = objcclass external;
+  NSApplication = objcclass external;
+  NSArrayController = objcclass external;
+  NSATSTypesetter = objcclass external;
+  NSFileWrapper = objcclass external;
+  NSTextBlock = objcclass external;
+  NSTextTable = objcclass external;
+  NSTextList = objcclass external;
+  CIImage = objcclass external;
+  NSColor = objcclass external;
+  NSColorSpace = objcclass external;
+  NSBitmapImageRep = objcclass external;
+  NSFont = objcclass external;
+  NSBox = objcclass external;
+  NSMatrix = objcclass external;
+  NSScroller = objcclass external;
+  NSBrowser = objcclass external;
+  NSBrowserCell = objcclass external;
+  NSSound = objcclass external;
+  NSButtonCell = objcclass external;
+  NSCachedImageRep = objcclass external;
+  NSEvent = objcclass external;
+  NSMenu = objcclass external;
+  NSText = objcclass external;
+  NSView = objcclass external;
+  NSTextView = objcclass external;
+  NSCell = objcclass external;
+  NSCIImageRep = objcclass external;
+  NSClipView = objcclass external;
+  NSCollectionView = objcclass external;
+  NSNib = objcclass external;
+  NSCollectionViewItem = objcclass external;
+  NSColorList = objcclass external;
+  NSColorPanel = objcclass external;
+  NSColorPicker = objcclass external;
+  NSColorWell = objcclass external;
+  NSComboBox = objcclass external;
+  NSTableView = objcclass external;
+  NSComboBoxCell = objcclass external;
+  NSControl = objcclass external;
+  NSController = objcclass external;
+  NSCursor = objcclass external;
+  NSCustomImageRep = objcclass external;
+  NSDatePicker = objcclass external;
+  NSDatePickerCell = objcclass external;
+  NSDictionaryController = objcclass external;
+  NSMenuItem = objcclass external;
+  NSPageLayout = objcclass external;
+  NSPrintInfo = objcclass external;
+  NSPrintOperation = objcclass external;
+  NSSavePanel = objcclass external;
+  NSWindowController = objcclass external;
+  NSDocument = objcclass external;
+  NSOpenPanel = objcclass external;
+  NSDocumentController = objcclass external;
+  NSDrawer = objcclass external;
+  NSPDFImageRep = objcclass external;
+  NSEPSImageRep = objcclass external;
+  NSTrackingArea = objcclass external;
+  NSFontDescriptor = objcclass external;
+  NSFontPanel = objcclass external;
+  NSFontManager = objcclass external;
+  NSFormCell = objcclass external;
+  NSGlyphGenerator = objcclass external;
+  NSGlyphInfo = objcclass external;
+  NSGradient = objcclass external;
+  CIContext = objcclass external;
+  NSHelpManager = objcclass external;
+  NSImageRep = objcclass external;
+  _NSImageAuxiliary = objcclass external;
+  NSImageCell = objcclass external;
+  NSImageView = objcclass external;
+  NSInputServer = objcclass external;
+  NSInputManager = objcclass external;
+  NSTextStorage = objcclass external;
+  NSTypesetter = objcclass external;
+  NSTextContainer = objcclass external;
+  NSRulerView = objcclass external;
+  NSParagraphStyle = objcclass external;
+  NSRulerMarker = objcclass external;
+  NSTabWell = objcclass external;
+  NSStorage = objcclass external;
+  NSRunStorage = objcclass external;
+  NSSortedArray = objcclass external;
+  NSLayoutManager = objcclass external;
+  NSLevelIndicator = objcclass external;
+  NSLevelIndicatorCell = objcclass external;
+  NSMenuView = objcclass external;
+  NSMenuItemCell = objcclass external;
+  NSScreen = objcclass external;
+  QTMovie = objcclass external;
+  NSMovie = objcclass external;
+  NSMovieView = objcclass external;
+  NSIBObjectData = objcclass external;
+  NSNibConnector = objcclass external;
+  NSNibControlConnector = objcclass external;
+  NSNibOutletConnector = objcclass external;
+  NSManagedObjectContext = objcclass external;
+  NSFetchRequest = objcclass external;
+  NSObjectController = objcclass external;
+  NSOpenGLPixelFormat = objcclass external;
+  NSOpenGLPixelBuffer = objcclass external;
+  NSOpenGLContext = objcclass external;
+  NSOpenGLLayer = objcclass external;
+  NSOpenGLView = objcclass external;
+  NSTableHeaderView = objcclass external;
+  NSTableColumn = objcclass external;
+  NSMouseTracker = objcclass external;
+  NSOutlineView = objcclass external;
+  NSViewController = objcclass external;
+  NSTextTab = objcclass external;
+  NSMutableParagraphStyle = objcclass external;
+  NSPasteboardItem = objcclass external;
+  NSPathComponentCell = objcclass external;
+  NSPopUpButtonCell = objcclass external;
+  NSPathCell = objcclass external;
+  NSPathControl = objcclass external;
+  NSManagedObjectModel = objcclass external;
+  NSPersistentDocument = objcclass external;
+  NSPICTImageRep = objcclass external;
+  NSPopUpButton = objcclass external;
+  NSPredicateTemplate = objcclass external;
+  NSPredicateEditor = objcclass external;
+  NSEntityDescription = objcclass external;
+  NSPredicateEditorRowTemplate = objcclass external;
+  NSPrinter = objcclass external;
+  NSPrintPanel = objcclass external;
+  NSProgressIndicator = objcclass external;
+  NSQuickDrawView = objcclass external;
+  NSResponder = objcclass external;
+  NSRuleEditor = objcclass external;
+  NSScrollView = objcclass external;
+  NSRunningApplication = objcclass external;
+  NSNavView = objcclass external;
+  NSSavePanelAuxiliary = objcclass external;
+  NSSearchField = objcclass external;
+  NSSearchFieldCell = objcclass external;
+  NSSecureTextField = objcclass external;
+  NSSecureTextFieldCell = objcclass external;
+  NSSegmentedCell = objcclass external;
+  NSSegmentedControl = objcclass external;
+  NSShadow = objcclass external;
+  NSSimpleHorizontalTypesetter = objcclass external;
+  NSSlider = objcclass external;
+  NSSliderCell = objcclass external;
+  NSSpeechRecognizer = objcclass external;
+  NSSpeechSynthesizer = objcclass external;
+  NSSpellChecker = objcclass external;
+  NSSplitView = objcclass external;
+  NSStatusItem = objcclass external;
+  NSStatusBar = objcclass external;
+  NSStepper = objcclass external;
+  NSStepperCell = objcclass external;
+  NSTableHeaderCell = objcclass external;
+  NSTabViewItem = objcclass external;
+  NSTabView = objcclass external;
+  NSTextAttachment = objcclass external;
+  NSTextAttachmentCell = objcclass external;
+  NSTextFieldCell = objcclass external;
+  NSTextInputContext = objcclass external;
+  NSTextTableBlock = objcclass external;
+  NSTokenField = objcclass external;
+  NSTokenFieldCell = objcclass external;
+  NSToolbarItem = objcclass external;
+  NSToolbar = objcclass external;
+  NSToolbarItemViewer = objcclass external;
+  NSToolbarItemGroup = objcclass external;
+  NSTouch = objcclass external;
+  NSTreeNode = objcclass external;
+  NSTreeController = objcclass external;
+  NSUserDefaultsController = objcclass external;
+  CIFilter = objcclass external;
+  CALayer = objcclass external;
+  _NSViewAuxiliary = objcclass external;
+  NSWindowAuxiliary = objcclass external;
+  NSWorkspace = objcclass external;
+  CAMediaTimingFunction = objcclass external;
+  CAValueFunction = objcclass external;
+  CAAnimation = objcclass external;
+  CAPropertyAnimation = objcclass external;
+  CABasicAnimation = objcclass external;
+  CAKeyframeAnimation = objcclass external;
+  CATransition = objcclass external;
+  CAAnimationGroup = objcclass external;
+  CAConstraint = objcclass external;
+  CAConstraintLayoutManager = objcclass external;
+  CAEmitterCell = objcclass external;
+  CAEmitterLayer = objcclass external;
+  CAGradientLayer = objcclass external;
+  CALayerArray = objcclass external;
+  CAOpenGLLayer = objcclass external;
+  CARenderer = objcclass external;
+  CAReplicatorLayer = objcclass external;
+  CAScrollLayer = objcclass external;
+  CAShapeLayer = objcclass external;
+  CATextLayer = objcclass external;
+  CATiledLayer = objcclass external;
+  CATransaction = objcclass external;
+  CATransformLayer = objcclass external;
+  CIColor = objcclass external;
+  CIKernel = objcclass external;
+  CIFilterGenerator = objcclass external;
+  CIFilterShape = objcclass external;
+  CIImageAccumulator = objcclass external;
+  CIPlugIn = objcclass external;
+  CISampler = objcclass external;
+  CIVector = objcclass external;
 
 implementation
 

packages/cocoaint/src/AnonClassDefinitionsWebkit.pas

@@ -9,335 +9,335 @@ unit AnonClassDefinitionsWebkit;
 interface
 
 type
-  Protocol = objcclass; external;
-  NSAffineTransform = objcclass; external;
-  NSData = objcclass; external;
-  NSAppleEventDescriptor = objcclass; external;
-  NSAppleEventManager = objcclass; external;
-  NSDictionary = objcclass; external;
-  NSString = objcclass; external;
-  NSURL = objcclass; external;
-  NSAppleScript = objcclass; external;
-  NSMutableData = objcclass; external;
-  NSMutableDictionary = objcclass; external;
-  NSMutableArray = objcclass; external;
-  NSArchiver = objcclass; external;
-  NSUnarchiver = objcclass; external;
-  NSIndexSet = objcclass; external;
-  NSArray = objcclass; external;
-  NSAttributedString = objcclass; external;
-  NSMutableAttributedString = objcclass; external;
-  NSAutoreleasePool = objcclass; external;
-  NSError = objcclass; external;
-  NSBundle = objcclass; external;
-  NSCache = objcclass; external;
-  NSDateComponents = objcclass; external;
-  NSLocale = objcclass; external;
-  NSTimeZone = objcclass; external;
-  NSCalendar = objcclass; external;
-  NSCalendarDate = objcclass; external;
-  NSCharacterSet = objcclass; external;
-  NSMutableCharacterSet = objcclass; external;
-  NSClassDescription = objcclass; external;
-  NSCoder = objcclass; external;
-  NSPredicateOperator = objcclass; external;
-  NSExpression = objcclass; external;
-  NSComparisonPredicate = objcclass; external;
-  NSCompoundPredicate = objcclass; external;
-  NSDistantObject = objcclass; external;
-  NSException = objcclass; external;
-  NSPort = objcclass; external;
-  NSRunLoop = objcclass; external;
-  NSPortNameServer = objcclass; external;
-  NSDistantObjectRequest = objcclass; external;
-  NSConnection = objcclass; external;
-  NSPurgeableData = objcclass; external;
-  NSDate = objcclass; external;
-  NSDateFormatter = objcclass; external;
-  NSDecimalNumber = objcclass; external;
-  NSDecimalNumberHandler = objcclass; external;
-  NSSet = objcclass; external;
-  NSDistributedLock = objcclass; external;
-  NSDistributedNotificationCenter = objcclass; external;
-  NSEnumerator = objcclass; external;
-  NSAssertionHandler = objcclass; external;
-  NSPredicate = objcclass; external;
-  NSFileHandle = objcclass; external;
-  NSPipe = objcclass; external;
-  NSDirectoryEnumerator = objcclass; external;
-  NSNumber = objcclass; external;
-  NSFileManager = objcclass; external;
-  NSFormatter = objcclass; external;
-  NSGarbageCollector = objcclass; external;
-  NSHashTable = objcclass; external;
-  NSHost = objcclass; external;
-  NSHTTPCookieInternal = objcclass; external;
-  NSHTTPCookie = objcclass; external;
-  NSHTTPCookieStorageInternal = objcclass; external;
-  NSHTTPCookieStorage = objcclass; external;
-  NSIndexPath = objcclass; external;
-  NSMutableIndexSet = objcclass; external;
-  NSMethodSignature = objcclass; external;
-  NSInvocation = objcclass; external;
-  NSKeyedArchiver = objcclass; external;
-  NSKeyedUnarchiver = objcclass; external;
-  NSLock = objcclass; external;
-  NSConditionLock = objcclass; external;
-  NSRecursiveLock = objcclass; external;
-  NSCondition = objcclass; external;
-  NSMapTable = objcclass; external;
-  NSMetadataItem = objcclass; external;
-  NSMetadataQueryAttributeValueTuple = objcclass; external;
-  NSMetadataQueryResultGroup = objcclass; external;
-  NSMetadataQuery = objcclass; external;
-  NSInputStream = objcclass; external;
-  NSOutputStream = objcclass; external;
-  NSNetService = objcclass; external;
-  NSNetServiceBrowser = objcclass; external;
-  NSOperationQueue = objcclass; external;
-  NSNotification = objcclass; external;
-  NSNotificationCenter = objcclass; external;
-  NSNotificationQueue = objcclass; external;
-  NSNull = objcclass; external;
-  NSNumberFormatter = objcclass; external;
-  NSObject = objcclass; external;
-  NSScriptObjectSpecifier = objcclass; external;
-  NSOperation = objcclass; external;
-  NSBlockOperation = objcclass; external;
-  NSInvocationOperation = objcclass; external;
-  NSOrthography = objcclass; external;
-  NSPointerArray = objcclass; external;
-  NSPointerFunctions = objcclass; external;
-  NSPortMessage = objcclass; external;
-  NSMachPort = objcclass; external;
-  NSMessagePort = objcclass; external;
-  NSSocketPort = objcclass; external;
-  NSPortCoder = objcclass; external;
-  NSMachBootstrapServer = objcclass; external;
-  NSMessagePortNameServer = objcclass; external;
-  NSSocketPortNameServer = objcclass; external;
-  NSProcessInfo = objcclass; external;
-  NSPropertyListSerialization = objcclass; external;
-  NSProtocolChecker = objcclass; external;
-  NSProxy = objcclass; external;
-  NSTimer = objcclass; external;
-  NSScanner = objcclass; external;
-  NSScriptCommandDescription = objcclass; external;
-  NSScriptClassDescription = objcclass; external;
-  NSScriptCoercionHandler = objcclass; external;
-  NSScriptCommand = objcclass; external;
-  NSScriptExecutionContext = objcclass; external;
-  NSScriptWhoseTest = objcclass; external;
-  NSIndexSpecifier = objcclass; external;
-  NSMiddleSpecifier = objcclass; external;
-  NSNameSpecifier = objcclass; external;
-  NSPositionalSpecifier = objcclass; external;
-  NSPropertySpecifier = objcclass; external;
-  NSRandomSpecifier = objcclass; external;
-  NSRangeSpecifier = objcclass; external;
-  NSRelativeSpecifier = objcclass; external;
-  NSUniqueIDSpecifier = objcclass; external;
-  NSWhoseSpecifier = objcclass; external;
-  NSCloneCommand = objcclass; external;
-  NSCloseCommand = objcclass; external;
-  NSCountCommand = objcclass; external;
-  NSCreateCommand = objcclass; external;
-  NSDeleteCommand = objcclass; external;
-  NSExistsCommand = objcclass; external;
-  NSGetCommand = objcclass; external;
-  NSMoveCommand = objcclass; external;
-  NSQuitCommand = objcclass; external;
-  NSSetCommand = objcclass; external;
-  NSMutableSet = objcclass; external;
-  NSScriptSuiteRegistry = objcclass; external;
-  NSLogicalTest = objcclass; external;
-  NSSpecifierTest = objcclass; external;
-  NSCountedSet = objcclass; external;
-  NSSortDescriptor = objcclass; external;
-  NSSpellServer = objcclass; external;
-  NSStream = objcclass; external;
-  NSMutableString = objcclass; external;
-  NSSimpleCString = objcclass; external;
-  NSConstantString = objcclass; external;
-  NSTask = objcclass; external;
-  NSTextCheckingResult = objcclass; external;
-  NSThread = objcclass; external;
-  NSUndoManager = objcclass; external;
-  NSURLAuthenticationChallenge = objcclass; external;
-  NSURLCredential = objcclass; external;
-  NSURLProtectionSpace = objcclass; external;
-  NSURLResponse = objcclass; external;
-  NSURLAuthenticationChallengeInternal = objcclass; external;
-  NSCachedURLResponseInternal = objcclass; external;
-  NSURLRequest = objcclass; external;
-  NSCachedURLResponse = objcclass; external;
-  NSURLCacheInternal = objcclass; external;
-  NSURLCache = objcclass; external;
-  NSURLConnectionInternal = objcclass; external;
-  NSURLConnection = objcclass; external;
-  NSURLCredentialInternal = objcclass; external;
-  NSURLCredentialStorageInternal = objcclass; external;
-  NSURLCredentialStorage = objcclass; external;
-  NSURLDownloadInternal = objcclass; external;
-  NSURLDownload = objcclass; external;
-  NSURLHandle = objcclass; external;
-  NSURLProtectionSpaceInternal = objcclass; external;
-  NSMutableURLRequest = objcclass; external;
-  NSURLProtocol = objcclass; external;
-  NSURLProtocolInternal = objcclass; external;
-  NSURLRequestInternal = objcclass; external;
-  NSURLResponseInternal = objcclass; external;
-  NSHTTPURLResponseInternal = objcclass; external;
-  NSHTTPURLResponse = objcclass; external;
-  NSUserDefaults = objcclass; external;
-  NSValue = objcclass; external;
-  NSValueTransformer = objcclass; external;
-  NSXMLDTD = objcclass; external;
-  NSXMLDocument = objcclass; external;
-  NSXMLDTDNode = objcclass; external;
-  NSXMLElement = objcclass; external;
-  NSXMLNode = objcclass; external;
-  NSXMLParser = objcclass; external;
-  NSImage = objcclass; external;
-  DOMDocument = objcclass; external;
-  DOMAbstractView = objcclass; external;
-  DOMCSSStyleDeclaration = objcclass; external;
-  DOMElement = objcclass; external;
-  DOMAttr = objcclass; external;
-  DOMCDATASection = objcclass; external;
-  DOMCharacterData = objcclass; external;
-  DOMComment = objcclass; external;
-  DOMCounter = objcclass; external;
-  DOMCSSCharsetRule = objcclass; external;
-  DOMCSSFontFaceRule = objcclass; external;
-  DOMCSSStyleSheet = objcclass; external;
-  DOMMediaList = objcclass; external;
-  DOMCSSImportRule = objcclass; external;
-  DOMCSSRuleList = objcclass; external;
-  DOMCSSMediaRule = objcclass; external;
-  DOMCSSPageRule = objcclass; external;
-  DOMRGBColor = objcclass; external;
-  DOMRect = objcclass; external;
-  DOMCSSPrimitiveValue = objcclass; external;
-  DOMCSSRule = objcclass; external;
-  DOMCSSValue = objcclass; external;
-  DOMCSSStyleRule = objcclass; external;
-  DOMCSSUnknownRule = objcclass; external;
-  DOMCSSValueList = objcclass; external;
-  DOMDocumentFragment = objcclass; external;
-  DOMDocumentType = objcclass; external;
-  DOMEntityReference = objcclass; external;
-  DOMEvent = objcclass; external;
-  DOMHTMLCollection = objcclass; external;
-  DOMHTMLElement = objcclass; external;
-  DOMImplementation = objcclass; external;
-  DOMNode = objcclass; external;
-  DOMNodeIterator = objcclass; external;
-  DOMNodeList = objcclass; external;
-  DOMProcessingInstruction = objcclass; external;
-  DOMRange = objcclass; external;
-  DOMStyleSheetList = objcclass; external;
-  DOMText = objcclass; external;
-  DOMTreeWalker = objcclass; external;
-  DOMXPathExpression = objcclass; external;
-  DOMXPathResult = objcclass; external;
-  DOMNamedNodeMap = objcclass; external;
-  DOMEntity = objcclass; external;
-  DOMFile = objcclass; external;
-  DOMFileList = objcclass; external;
-  DOMHTMLAnchorElement = objcclass; external;
-  DOMHTMLAppletElement = objcclass; external;
-  DOMHTMLAreaElement = objcclass; external;
-  DOMHTMLBaseElement = objcclass; external;
-  DOMHTMLBaseFontElement = objcclass; external;
-  DOMHTMLBodyElement = objcclass; external;
-  DOMHTMLBRElement = objcclass; external;
-  DOMHTMLFormElement = objcclass; external;
-  DOMHTMLButtonElement = objcclass; external;
-  DOMHTMLDirectoryElement = objcclass; external;
-  DOMHTMLDivElement = objcclass; external;
-  DOMHTMLDListElement = objcclass; external;
-  DOMHTMLDocument = objcclass; external;
-  DOMHTMLEmbedElement = objcclass; external;
-  DOMHTMLFieldSetElement = objcclass; external;
-  DOMHTMLFontElement = objcclass; external;
-  DOMHTMLFrameElement = objcclass; external;
-  DOMHTMLFrameSetElement = objcclass; external;
-  DOMHTMLHeadElement = objcclass; external;
-  DOMHTMLHeadingElement = objcclass; external;
-  DOMHTMLHRElement = objcclass; external;
-  DOMHTMLHtmlElement = objcclass; external;
-  DOMHTMLIFrameElement = objcclass; external;
-  DOMHTMLImageElement = objcclass; external;
-  DOMHTMLInputElement = objcclass; external;
-  DOMHTMLIsIndexElement = objcclass; external;
-  DOMHTMLLabelElement = objcclass; external;
-  DOMHTMLLegendElement = objcclass; external;
-  DOMHTMLLIElement = objcclass; external;
-  DOMStyleSheet = objcclass; external;
-  DOMHTMLLinkElement = objcclass; external;
-  DOMHTMLMapElement = objcclass; external;
-  DOMHTMLMarqueeElement = objcclass; external;
-  DOMHTMLMenuElement = objcclass; external;
-  DOMHTMLMetaElement = objcclass; external;
-  DOMHTMLModElement = objcclass; external;
-  DOMHTMLObjectElement = objcclass; external;
-  DOMHTMLOListElement = objcclass; external;
-  DOMHTMLOptGroupElement = objcclass; external;
-  DOMHTMLOptionElement = objcclass; external;
-  DOMHTMLOptionsCollection = objcclass; external;
-  DOMHTMLParagraphElement = objcclass; external;
-  DOMHTMLParamElement = objcclass; external;
-  DOMHTMLPreElement = objcclass; external;
-  DOMHTMLQuoteElement = objcclass; external;
-  DOMHTMLScriptElement = objcclass; external;
-  DOMHTMLSelectElement = objcclass; external;
-  DOMHTMLStyleElement = objcclass; external;
-  DOMHTMLTableCaptionElement = objcclass; external;
-  DOMHTMLTableCellElement = objcclass; external;
-  DOMHTMLTableColElement = objcclass; external;
-  DOMHTMLTableSectionElement = objcclass; external;
-  DOMHTMLTableElement = objcclass; external;
-  DOMHTMLTableRowElement = objcclass; external;
-  DOMHTMLTextAreaElement = objcclass; external;
-  DOMHTMLTitleElement = objcclass; external;
-  DOMHTMLUListElement = objcclass; external;
-  DOMKeyboardEvent = objcclass; external;
-  DOMMouseEvent = objcclass; external;
-  DOMMutationEvent = objcclass; external;
-  DOMNotation = objcclass; external;
-  DOMObject = objcclass; external;
-  DOMOverflowEvent = objcclass; external;
-  DOMProgressEvent = objcclass; external;
-  NSColor = objcclass; external;
-  DOMUIEvent = objcclass; external;
-  DOMWheelEvent = objcclass; external;
-  WebView = objcclass; external;
-  WebArchivePrivate = objcclass; external;
-  WebResource = objcclass; external;
-  WebArchive = objcclass; external;
-  WebHistoryItem = objcclass; external;
-  WebBackForwardListPrivate = objcclass; external;
-  WebBackForwardList = objcclass; external;
-  WebDataSourcePrivate = objcclass; external;
-  WebFrame = objcclass; external;
-  WebDataSource = objcclass; external;
-  WebDownloadInternal = objcclass; external;
-  WebDownload = objcclass; external;
-  WebFramePrivate = objcclass; external;
-  WebFrameView = objcclass; external;
-  WebScriptObject = objcclass; external;
-  WebFrameViewPrivate = objcclass; external;
-  WebHistoryPrivate = objcclass; external;
-  WebHistory = objcclass; external;
-  WebHistoryItemPrivate = objcclass; external;
-  WebPolicyPrivate = objcclass; external;
-  WebPreferencesPrivate = objcclass; external;
-  WebPreferences = objcclass; external;
-  WebResourcePrivate = objcclass; external;
-  WebScriptObjectPrivate = objcclass; external;
-  WebUndefined = objcclass; external;
-  WebViewPrivate = objcclass; external;
+  Protocol = objcclass external;
+  NSAffineTransform = objcclass external;
+  NSData = objcclass external;
+  NSAppleEventDescriptor = objcclass external;
+  NSAppleEventManager = objcclass external;
+  NSDictionary = objcclass external;
+  NSString = objcclass external;
+  NSURL = objcclass external;
+  NSAppleScript = objcclass external;
+  NSMutableData = objcclass external;
+  NSMutableDictionary = objcclass external;
+  NSMutableArray = objcclass external;
+  NSArchiver = objcclass external;
+  NSUnarchiver = objcclass external;
+  NSIndexSet = objcclass external;
+  NSArray = objcclass external;
+  NSAttributedString = objcclass external;
+  NSMutableAttributedString = objcclass external;
+  NSAutoreleasePool = objcclass external;
+  NSError = objcclass external;
+  NSBundle = objcclass external;
+  NSCache = objcclass external;
+  NSDateComponents = objcclass external;
+  NSLocale = objcclass external;
+  NSTimeZone = objcclass external;
+  NSCalendar = objcclass external;
+  NSCalendarDate = objcclass external;
+  NSCharacterSet = objcclass external;
+  NSMutableCharacterSet = objcclass external;
+  NSClassDescription = objcclass external;
+  NSCoder = objcclass external;
+  NSPredicateOperator = objcclass external;
+  NSExpression = objcclass external;
+  NSComparisonPredicate = objcclass external;
+  NSCompoundPredicate = objcclass external;
+  NSDistantObject = objcclass external;
+  NSException = objcclass external;
+  NSPort = objcclass external;
+  NSRunLoop = objcclass external;
+  NSPortNameServer = objcclass external;
+  NSDistantObjectRequest = objcclass external;
+  NSConnection = objcclass external;
+  NSPurgeableData = objcclass external;
+  NSDate = objcclass external;
+  NSDateFormatter = objcclass external;
+  NSDecimalNumber = objcclass external;
+  NSDecimalNumberHandler = objcclass external;
+  NSSet = objcclass external;
+  NSDistributedLock = objcclass external;
+  NSDistributedNotificationCenter = objcclass external;
+  NSEnumerator = objcclass external;
+  NSAssertionHandler = objcclass external;
+  NSPredicate = objcclass external;
+  NSFileHandle = objcclass external;
+  NSPipe = objcclass external;
+  NSDirectoryEnumerator = objcclass external;
+  NSNumber = objcclass external;
+  NSFileManager = objcclass external;
+  NSFormatter = objcclass external;
+  NSGarbageCollector = objcclass external;
+  NSHashTable = objcclass external;
+  NSHost = objcclass external;
+  NSHTTPCookieInternal = objcclass external;
+  NSHTTPCookie = objcclass external;
+  NSHTTPCookieStorageInternal = objcclass external;
+  NSHTTPCookieStorage = objcclass external;
+  NSIndexPath = objcclass external;
+  NSMutableIndexSet = objcclass external;
+  NSMethodSignature = objcclass external;
+  NSInvocation = objcclass external;
+  NSKeyedArchiver = objcclass external;
+  NSKeyedUnarchiver = objcclass external;
+  NSLock = objcclass external;
+  NSConditionLock = objcclass external;
+  NSRecursiveLock = objcclass external;
+  NSCondition = objcclass external;
+  NSMapTable = objcclass external;
+  NSMetadataItem = objcclass external;
+  NSMetadataQueryAttributeValueTuple = objcclass external;
+  NSMetadataQueryResultGroup = objcclass external;
+  NSMetadataQuery = objcclass external;
+  NSInputStream = objcclass external;
+  NSOutputStream = objcclass external;
+  NSNetService = objcclass external;
+  NSNetServiceBrowser = objcclass external;
+  NSOperationQueue = objcclass external;
+  NSNotification = objcclass external;
+  NSNotificationCenter = objcclass external;
+  NSNotificationQueue = objcclass external;
+  NSNull = objcclass external;
+  NSNumberFormatter = objcclass external;
+  NSObject = objcclass external;
+  NSScriptObjectSpecifier = objcclass external;
+  NSOperation = objcclass external;
+  NSBlockOperation = objcclass external;
+  NSInvocationOperation = objcclass external;
+  NSOrthography = objcclass external;
+  NSPointerArray = objcclass external;
+  NSPointerFunctions = objcclass external;
+  NSPortMessage = objcclass external;
+  NSMachPort = objcclass external;
+  NSMessagePort = objcclass external;
+  NSSocketPort = objcclass external;
+  NSPortCoder = objcclass external;
+  NSMachBootstrapServer = objcclass external;
+  NSMessagePortNameServer = objcclass external;
+  NSSocketPortNameServer = objcclass external;
+  NSProcessInfo = objcclass external;
+  NSPropertyListSerialization = objcclass external;
+  NSProtocolChecker = objcclass external;
+  NSProxy = objcclass external;
+  NSTimer = objcclass external;
+  NSScanner = objcclass external;
+  NSScriptCommandDescription = objcclass external;
+  NSScriptClassDescription = objcclass external;
+  NSScriptCoercionHandler = objcclass external;
+  NSScriptCommand = objcclass external;
+  NSScriptExecutionContext = objcclass external;
+  NSScriptWhoseTest = objcclass external;
+  NSIndexSpecifier = objcclass external;
+  NSMiddleSpecifier = objcclass external;
+  NSNameSpecifier = objcclass external;
+  NSPositionalSpecifier = objcclass external;
+  NSPropertySpecifier = objcclass external;
+  NSRandomSpecifier = objcclass external;
+  NSRangeSpecifier = objcclass external;
+  NSRelativeSpecifier = objcclass external;
+  NSUniqueIDSpecifier = objcclass external;
+  NSWhoseSpecifier = objcclass external;
+  NSCloneCommand = objcclass external;
+  NSCloseCommand = objcclass external;
+  NSCountCommand = objcclass external;
+  NSCreateCommand = objcclass external;
+  NSDeleteCommand = objcclass external;
+  NSExistsCommand = objcclass external;
+  NSGetCommand = objcclass external;
+  NSMoveCommand = objcclass external;
+  NSQuitCommand = objcclass external;
+  NSSetCommand = objcclass external;
+  NSMutableSet = objcclass external;
+  NSScriptSuiteRegistry = objcclass external;
+  NSLogicalTest = objcclass external;
+  NSSpecifierTest = objcclass external;
+  NSCountedSet = objcclass external;
+  NSSortDescriptor = objcclass external;
+  NSSpellServer = objcclass external;
+  NSStream = objcclass external;
+  NSMutableString = objcclass external;
+  NSSimpleCString = objcclass external;
+  NSConstantString = objcclass external;
+  NSTask = objcclass external;
+  NSTextCheckingResult = objcclass external;
+  NSThread = objcclass external;
+  NSUndoManager = objcclass external;
+  NSURLAuthenticationChallenge = objcclass external;
+  NSURLCredential = objcclass external;
+  NSURLProtectionSpace = objcclass external;
+  NSURLResponse = objcclass external;
+  NSURLAuthenticationChallengeInternal = objcclass external;
+  NSCachedURLResponseInternal = objcclass external;
+  NSURLRequest = objcclass external;
+  NSCachedURLResponse = objcclass external;
+  NSURLCacheInternal = objcclass external;
+  NSURLCache = objcclass external;
+  NSURLConnectionInternal = objcclass external;
+  NSURLConnection = objcclass external;
+  NSURLCredentialInternal = objcclass external;
+  NSURLCredentialStorageInternal = objcclass external;
+  NSURLCredentialStorage = objcclass external;
+  NSURLDownloadInternal = objcclass external;
+  NSURLDownload = objcclass external;
+  NSURLHandle = objcclass external;
+  NSURLProtectionSpaceInternal = objcclass external;
+  NSMutableURLRequest = objcclass external;
+  NSURLProtocol = objcclass external;
+  NSURLProtocolInternal = objcclass external;
+  NSURLRequestInternal = objcclass external;
+  NSURLResponseInternal = objcclass external;
+  NSHTTPURLResponseInternal = objcclass external;
+  NSHTTPURLResponse = objcclass external;
+  NSUserDefaults = objcclass external;
+  NSValue = objcclass external;
+  NSValueTransformer = objcclass external;
+  NSXMLDTD = objcclass external;
+  NSXMLDocument = objcclass external;
+  NSXMLDTDNode = objcclass external;
+  NSXMLElement = objcclass external;
+  NSXMLNode = objcclass external;
+  NSXMLParser = objcclass external;
+  NSImage = objcclass external;
+  DOMDocument = objcclass external;
+  DOMAbstractView = objcclass external;
+  DOMCSSStyleDeclaration = objcclass external;
+  DOMElement = objcclass external;
+  DOMAttr = objcclass external;
+  DOMCDATASection = objcclass external;
+  DOMCharacterData = objcclass external;
+  DOMComment = objcclass external;
+  DOMCounter = objcclass external;
+  DOMCSSCharsetRule = objcclass external;
+  DOMCSSFontFaceRule = objcclass external;
+  DOMCSSStyleSheet = objcclass external;
+  DOMMediaList = objcclass external;
+  DOMCSSImportRule = objcclass external;
+  DOMCSSRuleList = objcclass external;
+  DOMCSSMediaRule = objcclass external;
+  DOMCSSPageRule = objcclass external;
+  DOMRGBColor = objcclass external;
+  DOMRect = objcclass external;
+  DOMCSSPrimitiveValue = objcclass external;
+  DOMCSSRule = objcclass external;
+  DOMCSSValue = objcclass external;
+  DOMCSSStyleRule = objcclass external;
+  DOMCSSUnknownRule = objcclass external;
+  DOMCSSValueList = objcclass external;
+  DOMDocumentFragment = objcclass external;
+  DOMDocumentType = objcclass external;
+  DOMEntityReference = objcclass external;
+  DOMEvent = objcclass external;
+  DOMHTMLCollection = objcclass external;
+  DOMHTMLElement = objcclass external;
+  DOMImplementation = objcclass external;
+  DOMNode = objcclass external;
+  DOMNodeIterator = objcclass external;
+  DOMNodeList = objcclass external;
+  DOMProcessingInstruction = objcclass external;
+  DOMRange = objcclass external;
+  DOMStyleSheetList = objcclass external;
+  DOMText = objcclass external;
+  DOMTreeWalker = objcclass external;
+  DOMXPathExpression = objcclass external;
+  DOMXPathResult = objcclass external;
+  DOMNamedNodeMap = objcclass external;
+  DOMEntity = objcclass external;
+  DOMFile = objcclass external;
+  DOMFileList = objcclass external;
+  DOMHTMLAnchorElement = objcclass external;
+  DOMHTMLAppletElement = objcclass external;
+  DOMHTMLAreaElement = objcclass external;
+  DOMHTMLBaseElement = objcclass external;
+  DOMHTMLBaseFontElement = objcclass external;
+  DOMHTMLBodyElement = objcclass external;
+  DOMHTMLBRElement = objcclass external;
+  DOMHTMLFormElement = objcclass external;
+  DOMHTMLButtonElement = objcclass external;
+  DOMHTMLDirectoryElement = objcclass external;
+  DOMHTMLDivElement = objcclass external;
+  DOMHTMLDListElement = objcclass external;
+  DOMHTMLDocument = objcclass external;
+  DOMHTMLEmbedElement = objcclass external;
+  DOMHTMLFieldSetElement = objcclass external;
+  DOMHTMLFontElement = objcclass external;
+  DOMHTMLFrameElement = objcclass external;
+  DOMHTMLFrameSetElement = objcclass external;
+  DOMHTMLHeadElement = objcclass external;
+  DOMHTMLHeadingElement = objcclass external;
+  DOMHTMLHRElement = objcclass external;
+  DOMHTMLHtmlElement = objcclass external;
+  DOMHTMLIFrameElement = objcclass external;
+  DOMHTMLImageElement = objcclass external;
+  DOMHTMLInputElement = objcclass external;
+  DOMHTMLIsIndexElement = objcclass external;
+  DOMHTMLLabelElement = objcclass external;
+  DOMHTMLLegendElement = objcclass external;
+  DOMHTMLLIElement = objcclass external;
+  DOMStyleSheet = objcclass external;
+  DOMHTMLLinkElement = objcclass external;
+  DOMHTMLMapElement = objcclass external;
+  DOMHTMLMarqueeElement = objcclass external;
+  DOMHTMLMenuElement = objcclass external;
+  DOMHTMLMetaElement = objcclass external;
+  DOMHTMLModElement = objcclass external;
+  DOMHTMLObjectElement = objcclass external;
+  DOMHTMLOListElement = objcclass external;
+  DOMHTMLOptGroupElement = objcclass external;
+  DOMHTMLOptionElement = objcclass external;
+  DOMHTMLOptionsCollection = objcclass external;
+  DOMHTMLParagraphElement = objcclass external;
+  DOMHTMLParamElement = objcclass external;
+  DOMHTMLPreElement = objcclass external;
+  DOMHTMLQuoteElement = objcclass external;
+  DOMHTMLScriptElement = objcclass external;
+  DOMHTMLSelectElement = objcclass external;
+  DOMHTMLStyleElement = objcclass external;
+  DOMHTMLTableCaptionElement = objcclass external;
+  DOMHTMLTableCellElement = objcclass external;
+  DOMHTMLTableColElement = objcclass external;
+  DOMHTMLTableSectionElement = objcclass external;
+  DOMHTMLTableElement = objcclass external;
+  DOMHTMLTableRowElement = objcclass external;
+  DOMHTMLTextAreaElement = objcclass external;
+  DOMHTMLTitleElement = objcclass external;
+  DOMHTMLUListElement = objcclass external;
+  DOMKeyboardEvent = objcclass external;
+  DOMMouseEvent = objcclass external;
+  DOMMutationEvent = objcclass external;
+  DOMNotation = objcclass external;
+  DOMObject = objcclass external;
+  DOMOverflowEvent = objcclass external;
+  DOMProgressEvent = objcclass external;
+  NSColor = objcclass external;
+  DOMUIEvent = objcclass external;
+  DOMWheelEvent = objcclass external;
+  WebView = objcclass external;
+  WebArchivePrivate = objcclass external;
+  WebResource = objcclass external;
+  WebArchive = objcclass external;
+  WebHistoryItem = objcclass external;
+  WebBackForwardListPrivate = objcclass external;
+  WebBackForwardList = objcclass external;
+  WebDataSourcePrivate = objcclass external;
+  WebFrame = objcclass external;
+  WebDataSource = objcclass external;
+  WebDownloadInternal = objcclass external;
+  WebDownload = objcclass external;
+  WebFramePrivate = objcclass external;
+  WebFrameView = objcclass external;
+  WebScriptObject = objcclass external;
+  WebFrameViewPrivate = objcclass external;
+  WebHistoryPrivate = objcclass external;
+  WebHistory = objcclass external;
+  WebHistoryItemPrivate = objcclass external;
+  WebPolicyPrivate = objcclass external;
+  WebPreferencesPrivate = objcclass external;
+  WebPreferences = objcclass external;
+  WebResourcePrivate = objcclass external;
+  WebScriptObjectPrivate = objcclass external;
+  WebUndefined = objcclass external;
+  WebViewPrivate = objcclass external;
 
 implementation
 

packages/cocoaint/src/appkit/NSATSTypesetter.inc

@@ -1,5 +1,5 @@
 { Parsed from Appkit.framework NSATSTypesetter.h }
-{ Version: 2.1.2 - Wed Dec 8 10:06:06 CET 2010 }
+{ Version: 2.1.4 - Sun Jan 2 15:08:20 CET 2011 }
 
 
 {$ifdef TYPES}
@@ -42,7 +42,7 @@
 {$define NSATSTYPESETTER_PAS_C}
 
 { NSATSTypesetter }
-  NSATSTypesetter = objcclass(NSTypesetter)
+  NSATSTypesetter = objcclass external (NSTypesetter)
   private
     _attributedString: NSAttributedString;
     _paragraphGlyphRange: NSRange;
@@ -58,18 +58,16 @@
     _private: id;
     
   public
-    class function alloc: NSATSTypesetter; message 'alloc';
-
     class function sharedTypesetter: id; message 'sharedTypesetter';
-  end; external;
+  end;
 
 { NSPantherCompatibilityCategory }
-  NSPantherCompatibilityCategory = objccategory(NSATSTypesetter)
+  NSPantherCompatibilityCategory = objccategory external (NSATSTypesetter)
     function lineFragmentRectForProposedRect_remainingRect(proposedRect: NSRect; remainingRect: NSRectPointer): NSRect; message 'lineFragmentRectForProposedRect:remainingRect:'; deprecated 'in Mac OS X 10.4 and later';
-  end; external;
+  end;
 
 { NSPrimitiveInterfaceCategory }
-  NSPrimitiveInterfaceCategory = objccategory(NSATSTypesetter)
+  NSPrimitiveInterfaceCategory = objccategory external (NSATSTypesetter)
     function usesFontLeading: Boolean; message 'usesFontLeading';
     procedure setUsesFontLeading(flag: Boolean); message 'setUsesFontLeading:';
     function typesetterBehavior: NSTypesetterBehavior; message 'typesetterBehavior';
@@ -95,20 +93,20 @@
     function currentTextContainer: NSTextContainer; message 'currentTextContainer';
     procedure setHardInvalidation_forGlyphRange(flag: Boolean; glyphRange: NSRange); message 'setHardInvalidation:forGlyphRange:';
     procedure getLineFragmentRect_usedRect_forParagraphSeparatorGlyphRange_atProposedOrigin(lineFragmentRect: NSRectPtr; lineFragmentUsedRect: NSRectPtr; paragraphSeparatorGlyphRange_: NSRange; lineOrigin: NSPoint); message 'getLineFragmentRect:usedRect:forParagraphSeparatorGlyphRange:atProposedOrigin:';
-  end; external;
+  end;
 
 { NSLayoutPhaseInterface_NSATSTypesetterCategory }
-  NSLayoutPhaseInterface_NSATSTypesetterCategory = objccategory(NSATSTypesetter)
+  NSLayoutPhaseInterface_NSATSTypesetterCategory = objccategory external name 'NSLayoutPhaseInterface' (NSATSTypesetter)
     procedure willSetLineFragmentRect_forGlyphRange_usedRect_baselineOffset(lineRect: NSRectPtr; glyphRange: NSRange; usedRect: NSRectPtr; baselineOffset: CGFloatPtr); message 'willSetLineFragmentRect:forGlyphRange:usedRect:baselineOffset:';
     function shouldBreakLineByWordBeforeCharacterAtIndex(charIndex: NSUInteger): Boolean; message 'shouldBreakLineByWordBeforeCharacterAtIndex:';
     function shouldBreakLineByHyphenatingBeforeCharacterAtIndex(charIndex: NSUInteger): Boolean; message 'shouldBreakLineByHyphenatingBeforeCharacterAtIndex:';
     function hyphenationFactorForGlyphAtIndex(glyphIndex: NSUInteger): single; message 'hyphenationFactorForGlyphAtIndex:';
     function hyphenCharacterForGlyphAtIndex(glyphIndex: NSUInteger): UTF32Char; message 'hyphenCharacterForGlyphAtIndex:';
     function boundingBoxForControlGlyphAtIndex_forTextContainer_proposedLineFragment_glyphPosition_characterIndex(glyphIndex: NSUInteger; textContainer: NSTextContainer; proposedRect: NSRect; glyphPosition: NSPoint; charIndex: NSUInteger): NSRect; message 'boundingBoxForControlGlyphAtIndex:forTextContainer:proposedLineFragment:glyphPosition:characterIndex:';
-  end; external name 'NSLayoutPhaseInterface';
+  end;
 
 { NSGlyphStorageInterface_NSATSTypesetterCategory }
-  NSGlyphStorageInterface_NSATSTypesetterCategory = objccategory(NSATSTypesetter)
+  NSGlyphStorageInterface_NSATSTypesetterCategory = objccategory external name 'NSGlyphStorageInterface' (NSATSTypesetter)
     function characterRangeForGlyphRange_actualGlyphRange(glyphRange: NSRange; actualGlyphRange: NSRangePointer): NSRange; message 'characterRangeForGlyphRange:actualGlyphRange:';
     function glyphRangeForCharacterRange_actualCharacterRange(charRange: NSRange; actualCharRange: NSRangePointer): NSRange; message 'glyphRangeForCharacterRange:actualCharacterRange:';
     function getGlyphsInRange_glyphs_characterIndexes_glyphInscriptions_elasticBits(glyphsRange: NSRange; glyphBuffer: NSGlyphPtr; charIndexBuffer: NSUIntegerPtr; inscribeBuffer: NSGlyphInscriptionPtr; elasticBuffer: pboolean): NSUInteger; message 'getGlyphsInRange:glyphs:characterIndexes:glyphInscriptions:elasticBits:';
@@ -121,7 +119,7 @@
     procedure setLocation_withAdvancements_forStartOfGlyphRange(location: NSPoint; advancements: CGFloatPtr; glyphRange: NSRange); message 'setLocation:withAdvancements:forStartOfGlyphRange:';
     procedure setAttachmentSize_forGlyphRange(attachmentSize: NSSize; glyphRange: NSRange); message 'setAttachmentSize:forGlyphRange:';
     procedure setBidiLevels_forGlyphRange(levels: pbyte; glyphRange: NSRange); message 'setBidiLevels:forGlyphRange:';
-  end; external name 'NSGlyphStorageInterface';
+  end;
 
 {$endif}
 {$endif}

packages/cocoaint/src/appkit/NSAccessibility.inc

@@ -1,5 +1,5 @@
 { Parsed from Appkit.framework NSAccessibility.h }
-{ Version: 2.1.2 - Wed Dec 8 10:06:06 CET 2010 }
+{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
 
 
 {$ifdef TYPES}
@@ -337,7 +337,7 @@ var
 {$define NSACCESSIBILITY_PAS_C}
 
 { NSAccessibilityCategory }
-  NSAccessibilityCategory = objccategory(NSObject)
+  NSAccessibilityCategory = objccategory external (NSObject)
     function accessibilityAttributeNames: NSArray; message 'accessibilityAttributeNames';
     function accessibilityAttributeValue(attribute: NSString): id; message 'accessibilityAttributeValue:';
     function accessibilityIsAttributeSettable(attribute: NSString): Boolean; message 'accessibilityIsAttributeSettable:';
@@ -353,12 +353,12 @@ var
     function accessibilityIndexOfChild(child: id): NSUInteger; message 'accessibilityIndexOfChild:';
     function accessibilityArrayAttributeCount(attribute: NSString): NSUInteger; message 'accessibilityArrayAttributeCount:';
     function accessibilityArrayAttributeValues_index_maxCount(attribute: NSString; index: NSUInteger; maxCount: NSUInteger): NSArray; message 'accessibilityArrayAttributeValues:index:maxCount:';
-  end; external;
+  end;
 
 { NSAccessibilityAdditionsCategory }
-  NSAccessibilityAdditionsCategory = objccategory(NSObject)
+  NSAccessibilityAdditionsCategory = objccategory external (NSObject)
     function accessibilitySetOverrideValue_forAttribute(value: id; attribute: NSString): Boolean; message 'accessibilitySetOverrideValue:forAttribute:';
-  end; external;
+  end;
 
 {$endif}
 {$endif}

packages/cocoaint/src/appkit/NSActionCell.inc

@@ -1,5 +1,5 @@
 { Parsed from Appkit.framework NSActionCell.h }
-{ Version: 2.1.2 - Wed Dec 8 10:06:06 CET 2010 }
+{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
 
 
 {$ifdef TYPES}
@@ -42,7 +42,7 @@
 {$define NSACTIONCELL_PAS_C}
 
 { NSActionCell }
-  NSActionCell = objcclass(NSCell)
+  NSActionCell = objcclass external (NSCell)
   private
     _tag: NSInteger;
     _target: id;
@@ -50,15 +50,13 @@
     _controlView: id;
     
   public
-    class function alloc: NSActionCell; message 'alloc';
-
     function target: id; message 'target';
     procedure setTarget(anObject: id); message 'setTarget:';
     function action: SEL; message 'action';
     procedure setAction(aSelector: SEL); message 'setAction:';
     function tag: NSInteger; message 'tag';
     procedure setTag(anInt: NSInteger); message 'setTag:';
-  end; external;
+  end;
 
 {$endif}
 {$endif}

packages/cocoaint/src/appkit/NSAffineTransform.inc

@@ -1,5 +1,5 @@
 { Parsed from Appkit.framework NSAffineTransform.h }
-{ Version: 2.1.2 - Wed Dec 8 10:06:06 CET 2010 }
+{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
 
 
 {$ifdef TYPES}
@@ -51,13 +51,11 @@ NSAffineTransformStructPtr = ^NSAffineTransformStruct;
 {$define NSAFFINETRANSFORM_PAS_C}
 
 { NSAffineTransform }
-  NSAffineTransform = objcclass(NSObject, NSCopyingProtocol, NSCodingProtocol)
+  NSAffineTransform = objcclass external (NSObject, NSCopyingProtocol, NSCodingProtocol)
   private
     _transformStruct: NSAffineTransformStruct;
     
   public
-    class function alloc: NSAffineTransform; message 'alloc';
-
     class function transform: NSAffineTransform; message 'transform';
     function initWithTransform(transform_: NSAffineTransform): id; message 'initWithTransform:';
     procedure translateXBy_yBy(deltaX: CGFloat; deltaY: CGFloat); message 'translateXBy:yBy:';
@@ -77,14 +75,14 @@ NSAffineTransformStructPtr = ^NSAffineTransformStruct;
     function copyWithZone(zone_: NSZonePtr): id;
     procedure encodeWithCoder(aCoder: NSCoder);
     function initWithCoder(aDecoder: NSCoder): id;
-  end; external;
+  end;
 
 { NSAppKitAdditonsCategory }
-  NSAppKitAdditonsCategory = objccategory(NSAffineTransform)
+  NSAppKitAdditonsCategory = objccategory external (NSAffineTransform)
     function transformBezierPath(aPath: NSBezierPath): NSBezierPath; message 'transformBezierPath:';
     procedure set_; message 'set';
     procedure concat; message 'concat';
-  end; external;
+  end;
 
 {$endif}
 {$endif}

packages/cocoaint/src/appkit/NSAlert.inc

@@ -1,5 +1,5 @@
 { Parsed from Appkit.framework NSAlert.h }
-{ Version: 2.1.2 - Wed Dec 8 10:06:06 CET 2010 }
+{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
 
 
 {$ifdef TYPES}
@@ -60,7 +60,7 @@ type
 {$define NSALERT_PAS_C}
 
 { NSAlert }
-  NSAlert = objcclass(NSObject)
+  NSAlert = objcclass external (NSObject)
   private
     _informationField: NSTextField;
     _first: id;
@@ -94,8 +94,6 @@ type
     _accessoryView: id;
     
   public
-    class function alloc: NSAlert; message 'alloc';
-
     class function alertWithError(error: NSError): NSAlert; message 'alertWithError:';
     class function alertWithMessageText_defaultButton_alternateButton_otherButton_informativeTextWithFormat(message: NSString; defaultButton: NSString; alternateButton: NSString; otherButton: NSString; firstKey: id): NSAlert; varargs; message 'alertWithMessageText:defaultButton:alternateButton:otherButton:informativeTextWithFormat:';
     procedure setMessageText(messageText_: NSString); message 'setMessageText:';
@@ -124,7 +122,7 @@ type
     procedure alertDidEnd_returnCode_contextInfo(alert: NSAlert; returnCode: NSInteger; contextInfo: Pointer); message 'alertDidEnd:returnCode:contextInfo:';
     procedure beginSheetModalForWindow_modalDelegate_didEndSelector_contextInfo(window_: NSWindow; delegate_: id; didEndSelector: SEL; contextInfo: Pointer); message 'beginSheetModalForWindow:modalDelegate:didEndSelector:contextInfo:';
     function window: id; message 'window';
-  end; external;
+  end;
 
 {$endif}
 {$endif}
@@ -133,8 +131,8 @@ type
 {$define NSALERT_PAS_P}
   
 { NSAlertDelegate Protocol }
-  NSAlertDelegateProtocol = objcprotocol
+  NSAlertDelegateProtocol = objcprotocol external name 'NSAlertDelegate'
     function alertShowHelp(alert: NSAlert): Boolean; message 'alertShowHelp:';
-  end; external name 'NSAlertDelegate';
+  end;
 {$endif}
 {$endif}

packages/cocoaint/src/appkit/NSAnimation.inc

@@ -1,5 +1,5 @@
 { Parsed from Appkit.framework NSAnimation.h }
-{ Version: 2.1.2 - Wed Dec 8 10:06:07 CET 2010 }
+{ Version: 2.1.4 - Sun Jan 2 15:08:20 CET 2011 }
 
 
 {$ifdef TYPES}
@@ -82,7 +82,7 @@ var
 {$define NSANIMATION_PAS_C}
 
 { NSAnimation }
-  NSAnimation = objcclass(NSObject, NSCopyingProtocol, NSCodingProtocol)
+  NSAnimation = objcclass external (NSObject, NSCopyingProtocol, NSCodingProtocol)
   private
     _duration: NSTimeInterval;
     _currentProgress: NSAnimationProgress;
@@ -123,8 +123,6 @@ var
     _reserved4: NSInteger;
     
   public
-    class function alloc: NSAnimation; message 'alloc';
-
     function initWithDuration_animationCurve(duration_: NSTimeInterval; animationCurve_: NSAnimationCurve): id; message 'initWithDuration:animationCurve:';
     procedure startAnimation; message 'startAnimation';
     procedure stopAnimation; message 'stopAnimation';
@@ -156,10 +154,10 @@ var
     function copyWithZone(zone_: NSZonePtr): id;
     procedure encodeWithCoder(aCoder: NSCoder);
     function initWithCoder(aDecoder: NSCoder): id;
-  end; external;
+  end;
 
 { NSViewAnimation }
-  NSViewAnimation = objcclass(NSAnimation)
+  NSViewAnimation = objcclass external (NSAnimation)
   private
     _viewAnimations: NSArray;
     _viewAnimationInfo: CFMutableDictionaryRef;
@@ -180,12 +178,10 @@ var
     _reserved8: NSUInteger;
     
   public
-    class function alloc: NSViewAnimation; message 'alloc';
-
     function initWithViewAnimations(viewAnimations_: NSArray): id; message 'initWithViewAnimations:';
     function viewAnimations: NSArray; message 'viewAnimations';
     procedure setViewAnimations(viewAnimations_: NSArray); message 'setViewAnimations:';
-  end; external;
+  end;
 
 {$endif}
 {$endif}
@@ -194,20 +190,20 @@ var
 {$define NSANIMATION_PAS_P}
   
 { NSAnimationDelegate Protocol }
-  NSAnimationDelegateProtocol = objcprotocol
+  NSAnimationDelegateProtocol = objcprotocol external name 'NSAnimationDelegate'
     function animationShouldStart(animation: NSAnimation): Boolean; message 'animationShouldStart:';
     procedure animationDidStop(animation: NSAnimation); message 'animationDidStop:';
     procedure animationDidEnd(animation: NSAnimation); message 'animationDidEnd:';
     function animation_valueForProgress(animation: NSAnimation; progress: NSAnimationProgress): single; message 'animation:valueForProgress:';
     procedure animation_didReachProgressMark(animation: NSAnimation; progress: NSAnimationProgress); message 'animation:didReachProgressMark:';
-  end; external name 'NSAnimationDelegate';
+  end;
   
 { NSAnimatablePropertyContainer Protocol }
-  NSAnimatablePropertyContainerProtocol = objcprotocol
+  NSAnimatablePropertyContainerProtocol = objcprotocol external name 'NSAnimatablePropertyContainer'
     function animator: id; message 'animator';
     function animations: NSDictionary; message 'animations';
     procedure setAnimations(dict: NSDictionary); message 'setAnimations:';
     function animationForKey(key: NSString): id; message 'animationForKey:';
-  end; external name 'NSAnimatablePropertyContainer';
+  end;
 {$endif}
 {$endif}

packages/cocoaint/src/appkit/NSAnimationContext.inc

@@ -1,5 +1,5 @@
 { Parsed from Appkit.framework NSAnimationContext.h }
-{ Version: 2.1.2 - Wed Dec 8 10:06:06 CET 2010 }
+{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
 
 
 {$ifdef TYPES}
@@ -42,20 +42,18 @@
 {$define NSANIMATIONCONTEXT_PAS_C}
 
 { NSAnimationContext }
-  NSAnimationContext = objcclass(NSObject)
+  NSAnimationContext = objcclass external (NSObject)
   private
     _duration: NSTimeInterval;
         _reserved: array[0..4] of id;
     
   public
-    class function alloc: NSAnimationContext; message 'alloc';
-
     class procedure beginGrouping; message 'beginGrouping';
     class procedure endGrouping; message 'endGrouping';
     class function currentContext: NSAnimationContext; message 'currentContext';
     procedure setDuration(duration_: NSTimeInterval); message 'setDuration:';
     function duration: NSTimeInterval; message 'duration';
-  end; external;
+  end;
 
 {$endif}
 {$endif}

packages/cocoaint/src/appkit/NSAppleScriptExtensions.inc

@@ -1,5 +1,5 @@
 { Parsed from Appkit.framework NSAppleScriptExtensions.h }
-{ Version: 2.1.2 - Wed Dec 8 10:06:06 CET 2010 }
+{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
 
 
 {$ifdef TYPES}
@@ -39,9 +39,9 @@
 {$define NSAPPLESCRIPTEXTENSIONS_PAS_C}
 
 { NSExtensionsCategory }
-  NSExtensionsCategory = objccategory(NSAppleScript)
+  NSExtensionsCategory = objccategory external (NSAppleScript)
     function richTextSource: NSAttributedString; message 'richTextSource';
-  end; external;
+  end;
 
 {$endif}
 {$endif}

packages/cocoaint/src/appkit/NSApplication.inc

@@ -1,5 +1,5 @@
 { Parsed from Appkit.framework NSApplication.h }
-{ Version: 2.1.2 - Wed Dec 8 10:06:06 CET 2010 }
+{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
 
 
 {$ifdef TYPES}
@@ -165,7 +165,7 @@ var
 {$define NSAPPLICATION_PAS_C}
 
 { NSApplication }
-  NSApplication = objcclass(NSResponder, NSUserInterfaceValidationsProtocol)
+  NSApplication = objcclass external (NSResponder, NSUserInterfaceValidationsProtocol)
   private
     _currentEvent: NSEvent;
     _windowList: id;
@@ -220,8 +220,6 @@ var
     _threadingSupport: _NSThreadPrivatePtr;
     
   public
-    class function alloc: NSApplication; message 'alloc';
-
     class function sharedApplication: NSApplication; message 'sharedApplication';
     procedure setDelegate(anObject: id); message 'setDelegate:';
     function delegate: id; message 'delegate';
@@ -291,10 +289,10 @@ var
 
     { Adopted Protocols }
     function validateUserInterfaceItem(anItem: id): Boolean;
-  end; external;
+  end;
 
 { NSWindowsMenuCategory }
-  NSWindowsMenuCategory = objccategory(NSApplication)
+  NSWindowsMenuCategory = objccategory external (NSApplication)
     procedure setWindowsMenu(aMenu: NSMenu); message 'setWindowsMenu:';
     function windowsMenu: NSMenu; message 'windowsMenu';
     procedure arrangeInFront(sender: id); message 'arrangeInFront:';
@@ -303,49 +301,49 @@ var
     procedure changeWindowsItem_title_filename(win: NSWindow; aString: NSString; isFilename: Boolean); message 'changeWindowsItem:title:filename:';
     procedure updateWindowsItem(win: NSWindow); message 'updateWindowsItem:';
     procedure miniaturizeAll(sender: id); message 'miniaturizeAll:';
-  end; external;
+  end;
 
 { NSFullKeyboardAccessCategory }
-  NSFullKeyboardAccessCategory = objccategory(NSApplication)
+  NSFullKeyboardAccessCategory = objccategory external (NSApplication)
     function isFullKeyboardAccessEnabled: Boolean; message 'isFullKeyboardAccessEnabled';
-  end; external;
+  end;
 
 { NSServicesMenuCategory }
-  NSServicesMenuCategory = objccategory(NSApplication)
+  NSServicesMenuCategory = objccategory external (NSApplication)
     procedure setServicesMenu(aMenu: NSMenu); message 'setServicesMenu:';
     function servicesMenu: NSMenu; message 'servicesMenu';
     procedure registerServicesMenuSendTypes_returnTypes(sendTypes: NSArray; returnTypes: NSArray); message 'registerServicesMenuSendTypes:returnTypes:';
-  end; external;
+  end;
 
 { NSServicesRequestsCategory }
-  NSServicesRequestsCategory = objccategory(NSObject)
+  NSServicesRequestsCategory = objccategory external (NSObject)
     function writeSelectionToPasteboard_types(pboard: NSPasteboard; types: NSArray): Boolean; message 'writeSelectionToPasteboard:types:';
     function readSelectionFromPasteboard(pboard: NSPasteboard): Boolean; message 'readSelectionFromPasteboard:';
-  end; external;
+  end;
 
 { NSServicesHandlingCategory }
-  NSServicesHandlingCategory = objccategory(NSApplication)
+  NSServicesHandlingCategory = objccategory external (NSApplication)
     procedure setServicesProvider(provider: id); message 'setServicesProvider:';
     function servicesProvider: id; message 'servicesProvider';
-  end; external;
+  end;
 
 { NSStandardAboutPanelCategory }
-  NSStandardAboutPanelCategory = objccategory(NSApplication)
+  NSStandardAboutPanelCategory = objccategory external (NSApplication)
     procedure orderFrontStandardAboutPanel(sender: id); message 'orderFrontStandardAboutPanel:';
     procedure orderFrontStandardAboutPanelWithOptions(optionsDictionary: NSDictionary); message 'orderFrontStandardAboutPanelWithOptions:';
-  end; external;
+  end;
 
 { NSApplicationLayoutDirectionCategory }
-  NSApplicationLayoutDirectionCategory = objccategory(NSApplication)
+  NSApplicationLayoutDirectionCategory = objccategory external (NSApplication)
     function userInterfaceLayoutDirection: NSUserInterfaceLayoutDirection; message 'userInterfaceLayoutDirection';
-  end; external;
+  end;
 
 { NSDeprecated_NSApplicationCategory }
-  NSDeprecated_NSApplicationCategory = objccategory(NSApplication)
+  NSDeprecated_NSApplicationCategory = objccategory external name 'NSDeprecated' (NSApplication)
     function runModalForWindow_relativeToWindow(theWindow: NSWindow; docWindow: NSWindow): NSInteger; message 'runModalForWindow:relativeToWindow:'; deprecated 'in Mac OS X 10 and later';
     function beginModalSessionForWindow_relativeToWindow(theWindow: NSWindow; docWindow: NSWindow): NSModalSession; message 'beginModalSessionForWindow:relativeToWindow:'; deprecated 'in Mac OS X 10 and later';
     procedure application_printFiles(sender: NSApplication; filenames: NSArray); message 'application:printFiles:';
-  end; external name 'NSDeprecated';
+  end;
 
 {$endif}
 {$endif}
@@ -354,7 +352,7 @@ var
 {$define NSAPPLICATION_PAS_P}
   
 { NSApplicationDelegate Protocol }
-  NSApplicationDelegateProtocol = objcprotocol
+  NSApplicationDelegateProtocol = objcprotocol external name 'NSApplicationDelegate'
     function applicationShouldTerminate(sender: NSApplication): NSApplicationTerminateReply; message 'applicationShouldTerminate:';
     function application_openFile(sender: NSApplication; filename: NSString): Boolean; message 'application:openFile:';
     procedure application_openFiles(sender: NSApplication; filenames: NSArray); message 'application:openFiles:';
@@ -382,6 +380,6 @@ var
     procedure applicationDidUpdate(notification: NSNotification); message 'applicationDidUpdate:';
     procedure applicationWillTerminate(notification: NSNotification); message 'applicationWillTerminate:';
     procedure applicationDidChangeScreenParameters(notification: NSNotification); message 'applicationDidChangeScreenParameters:';
-  end; external name 'NSApplicationDelegate';
+  end;
 {$endif}
 {$endif}

packages/cocoaint/src/appkit/NSApplicationScripting.inc

@@ -1,5 +1,5 @@
 { Parsed from Appkit.framework NSApplicationScripting.h }
-{ Version: 2.1.2 - Wed Dec 8 10:06:06 CET 2010 }
+{ Version: 2.1.4 - Sun Jan 2 15:08:20 CET 2011 }
 
 
 {$ifdef TYPES}
@@ -39,15 +39,15 @@
 {$define NSAPPLICATIONSCRIPTING_PAS_C}
 
 { NSScripting_NSApplicationCategory }
-  NSScripting_NSApplicationCategory = objccategory(NSApplication)
+  NSScripting_NSApplicationCategory = objccategory external name 'NSScripting' (NSApplication)
     function orderedDocuments: NSArray; message 'orderedDocuments';
     function orderedWindows: NSArray; message 'orderedWindows';
-  end; external name 'NSScripting';
+  end;
 
 { NSApplicationScriptingDelegationCategory }
-  NSApplicationScriptingDelegationCategory = objccategory(NSObject)
+  NSApplicationScriptingDelegationCategory = objccategory external (NSObject)
     function application_delegateHandlesKey(sender: NSApplication; key: NSString): Boolean; message 'application:delegateHandlesKey:';
-  end; external;
+  end;
 
 {$endif}
 {$endif}

packages/cocoaint/src/appkit/NSArrayController.inc

@@ -1,5 +1,5 @@
 { Parsed from Appkit.framework NSArrayController.h }
-{ Version: 2.1.2 - Wed Dec 8 10:06:06 CET 2010 }
+{ Version: 2.1.4 - Sun Jan 2 15:08:20 CET 2011 }
 
 
 {$ifdef TYPES}
@@ -42,7 +42,7 @@
 {$define NSARRAYCONTROLLER_PAS_C}
 
 { NSArrayController }
-  NSArrayController = objcclass(NSObjectController)
+  NSArrayController = objcclass external (NSObjectController)
   private
     _reserved4: Pointer;
     _rearrangementExtensions: id;
@@ -77,8 +77,6 @@
     _arrangedObjects: NSArray;
     
   public
-    class function alloc: NSArrayController; message 'alloc';
-
     procedure rearrangeObjects; message 'rearrangeObjects';
     procedure setAutomaticallyRearrangesObjects(flag: Boolean); message 'setAutomaticallyRearrangesObjects:';
     function automaticallyRearrangesObjects: Boolean; message 'automaticallyRearrangesObjects';
@@ -126,7 +124,7 @@
     procedure removeObjectsAtArrangedObjectIndexes(indexes: NSIndexSet); message 'removeObjectsAtArrangedObjectIndexes:';
     procedure removeObject(object_: id); message 'removeObject:';
     procedure removeObjects(objects: NSArray); message 'removeObjects:';
-  end; external;
+  end;
 
 {$endif}
 {$endif}

packages/cocoaint/src/appkit/NSAttributedString.inc

@@ -1,5 +1,5 @@
 { Parsed from Appkit.framework NSAttributedString.h }
-{ Version: 2.1.2 - Wed Dec 8 10:06:06 CET 2010 }
+{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
 
 
 {$ifdef TYPES}
@@ -154,11 +154,9 @@ var
 {$define NSATTRIBUTEDSTRING_PAS_C}
 
 { NSAttributedString }
-  NSAttributedString = objcclass(NSObject, NSCopyingProtocol, NSMutableCopyingProtocol, NSCodingProtocol)
+  NSAttributedString = objcclass external (NSObject, NSCopyingProtocol, NSMutableCopyingProtocol, NSCodingProtocol)
     
   public
-    class function alloc: NSAttributedString; message 'alloc';
-
     function string_: NSString; message 'string';
     function attributesAtIndex_effectiveRange(location: NSUInteger; range: NSRangePointer): NSDictionary; message 'attributesAtIndex:effectiveRange:';
 
@@ -167,20 +165,18 @@ var
     function mutableCopyWithZone(zone_: NSZonePtr): id;
     procedure encodeWithCoder(aCoder: NSCoder);
     function initWithCoder(aDecoder: NSCoder): id;
-  end; external;
+  end;
 
 { NSMutableAttributedString }
-  NSMutableAttributedString = objcclass(NSAttributedString)
+  NSMutableAttributedString = objcclass external (NSAttributedString)
     
   public
-    class function alloc: NSMutableAttributedString; message 'alloc';
-
     procedure replaceCharactersInRange_withString(range: NSRange; str: NSString); message 'replaceCharactersInRange:withString:';
     procedure setAttributes_range(attrs: NSDictionary; range: NSRange); message 'setAttributes:range:';
-  end; external;
+  end;
 
 { NSExtendedAttributedStringCategory }
-  NSExtendedAttributedStringCategory = objccategory(NSAttributedString)
+  NSExtendedAttributedStringCategory = objccategory external (NSAttributedString)
     function length: NSUInteger; message 'length';
     function attribute_atIndex_effectiveRange(attrName: NSString; location: NSUInteger; range: NSRangePointer): id; message 'attribute:atIndex:effectiveRange:';
     function attributedSubstringFromRange(range: NSRange): NSAttributedString; message 'attributedSubstringFromRange:';
@@ -190,10 +186,10 @@ var
     function initWithString(str: NSString): id; message 'initWithString:';
     function initWithString_attributes(str: NSString; attrs: NSDictionary): id; message 'initWithString:attributes:';
     function initWithAttributedString(attrStr: NSAttributedString): id; message 'initWithAttributedString:';
-  end; external;
+  end;
 
 { NSExtendedMutableAttributedStringCategory }
-  NSExtendedMutableAttributedStringCategory = objccategory(NSMutableAttributedString)
+  NSExtendedMutableAttributedStringCategory = objccategory external (NSMutableAttributedString)
     function mutableString: NSMutableString; message 'mutableString';
     procedure addAttribute_value_range(name: NSString; value: id; range: NSRange); message 'addAttribute:value:range:';
     procedure addAttributes_range(attrs: NSDictionary; range: NSRange); message 'addAttributes:range:';
@@ -205,10 +201,10 @@ var
     procedure setAttributedString(attrString: NSAttributedString); message 'setAttributedString:';
     procedure beginEditing; message 'beginEditing';
     procedure endEditing; message 'endEditing';
-  end; external;
+  end;
 
 { NSAttributedStringKitAdditionsCategory }
-  NSAttributedStringKitAdditionsCategory = objccategory(NSAttributedString)
+  NSAttributedStringKitAdditionsCategory = objccategory external (NSAttributedString)
     function fontAttributesInRange(range: NSRange): NSDictionary; message 'fontAttributesInRange:';
     function rulerAttributesInRange(range: NSRange): NSDictionary; message 'rulerAttributesInRange:';
     function containsAttachments: Boolean; message 'containsAttachments';
@@ -240,18 +236,18 @@ var
     function RTFDFromRange_documentAttributes(range: NSRange; dict: NSDictionary): NSData; message 'RTFDFromRange:documentAttributes:';
     function RTFDFileWrapperFromRange_documentAttributes(range: NSRange; dict: NSDictionary): NSFileWrapper; message 'RTFDFileWrapperFromRange:documentAttributes:';
     function docFormatFromRange_documentAttributes(range: NSRange; dict: NSDictionary): NSData; message 'docFormatFromRange:documentAttributes:';
-  end; external;
+  end;
 
 { NSDeprecatedKitAdditionsCategory }
-  NSDeprecatedKitAdditionsCategory = objccategory(NSAttributedString)
+  NSDeprecatedKitAdditionsCategory = objccategory external (NSAttributedString)
     class function textFileTypes: NSArray; message 'textFileTypes';
     class function textPasteboardTypes: NSArray; message 'textPasteboardTypes';
     class function textUnfilteredFileTypes: NSArray; message 'textUnfilteredFileTypes';
     class function textUnfilteredPasteboardTypes: NSArray; message 'textUnfilteredPasteboardTypes';
-  end; external;
+  end;
 
 { NSMutableAttributedStringKitAdditionsCategory }
-  NSMutableAttributedStringKitAdditionsCategory = objccategory(NSMutableAttributedString)
+  NSMutableAttributedStringKitAdditionsCategory = objccategory external (NSMutableAttributedString)
     function readFromURL_options_documentAttributes_error(url: NSURL; opts: NSDictionary; dict: NSDictionaryPointer; error: NSErrorPointer): Boolean; message 'readFromURL:options:documentAttributes:error:';
     function readFromData_options_documentAttributes_error(data: NSData; opts: NSDictionary; dict: NSDictionaryPointer; error: NSErrorPointer): Boolean; message 'readFromData:options:documentAttributes:error:';
     function readFromURL_options_documentAttributes(url: NSURL; options: NSDictionary; dict: NSDictionaryPointer): Boolean; message 'readFromURL:options:documentAttributes:';
@@ -266,7 +262,7 @@ var
     procedure fixFontAttributeInRange(range: NSRange); message 'fixFontAttributeInRange:';
     procedure fixParagraphStyleAttributeInRange(range: NSRange); message 'fixParagraphStyleAttributeInRange:';
     procedure fixAttachmentAttributeInRange(range: NSRange); message 'fixAttachmentAttributeInRange:';
-  end; external;
+  end;
 
 {$endif}
 {$endif}

packages/cocoaint/src/appkit/NSBezierPath.inc

@@ -1,5 +1,5 @@
 { Parsed from Appkit.framework NSBezierPath.h }
-{ Version: 2.1.2 - Wed Dec 8 10:06:06 CET 2010 }
+{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
 
 
 {$ifdef TYPES}
@@ -75,7 +75,7 @@ type
 {$define NSBEZIERPATH_PAS_C}
 
 { NSBezierPath }
-  NSBezierPath = objcclass(NSObject, NSCopyingProtocol, NSCodingProtocol)
+  NSBezierPath = objcclass external (NSObject, NSCopyingProtocol, NSCodingProtocol)
   private
     _elementCount: NSInteger;
     _elementMax: NSInteger;
@@ -105,8 +105,6 @@ type
       end;
     
   public
-    class function alloc: NSBezierPath; message 'alloc';
-
     class function bezierPath: NSBezierPath; message 'bezierPath';
     class function bezierPathWithRect(rect: NSRect): NSBezierPath; message 'bezierPathWithRect:';
     class function bezierPathWithOvalInRect(rect: NSRect): NSBezierPath; message 'bezierPathWithOvalInRect:';
@@ -182,13 +180,13 @@ type
     function copyWithZone(zone_: NSZonePtr): id;
     procedure encodeWithCoder(aCoder: NSCoder);
     function initWithCoder(aDecoder: NSCoder): id;
-  end; external;
+  end;
 
 { NSBezierPathDeprecatedCategory }
-  NSBezierPathDeprecatedCategory = objccategory(NSBezierPath)
+  NSBezierPathDeprecatedCategory = objccategory external (NSBezierPath)
     function cachesBezierPath: Boolean; message 'cachesBezierPath'; deprecated 'in Mac OS X 10 and later';
     procedure setCachesBezierPath(flag: Boolean); message 'setCachesBezierPath:'; deprecated 'in Mac OS X 10 and later';
-  end; external;
+  end;
 
 {$endif}
 {$endif}

packages/cocoaint/src/appkit/NSBitmapImageRep.inc

@@ -1,5 +1,5 @@
 { Parsed from Appkit.framework NSBitmapImageRep.h }
-{ Version: 2.1.2 - Wed Dec 8 10:06:06 CET 2010 }
+{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
 
 
 {$ifdef TYPES}
@@ -103,7 +103,7 @@ var
 {$define NSBITMAPIMAGEREP_PAS_C}
 
 { NSBitmapImageRep }
-  NSBitmapImageRep = objcclass(NSImageRep)
+  NSBitmapImageRep = objcclass external (NSImageRep)
   private
     __moreRepFlags: bitpacked record
       case byte of
@@ -130,8 +130,6 @@ var
     _properties: id;
     
   public
-    class function alloc: NSBitmapImageRep; message 'alloc';
-
     function initWithFocusedViewRect(rect: NSRect): id; message 'initWithFocusedViewRect:';
     function initWithBitmapDataPlanes_pixelsWide_pixelsHigh_bitsPerSample_samplesPerPixel_hasAlpha_isPlanar_colorSpaceName_bytesPerRow_bitsPerPixel(planes: PChar; width: NSInteger; height: NSInteger; bps: NSInteger; spp: NSInteger; alpha: Boolean; isPlanar_: Boolean; colorSpaceName_: NSString; rBytes: NSInteger; pBits: NSInteger): id; message 'initWithBitmapDataPlanes:pixelsWide:pixelsHigh:bitsPerSample:samplesPerPixel:hasAlpha:isPlanar:colorSpaceName:bytesPerRow:bitsPerPixel:';
     function initWithBitmapDataPlanes_pixelsWide_pixelsHigh_bitsPerSample_samplesPerPixel_hasAlpha_isPlanar_colorSpaceName_bitmapFormat_bytesPerRow_bitsPerPixel(planes: PChar; width: NSInteger; height: NSInteger; bps: NSInteger; spp: NSInteger; alpha: Boolean; isPlanar_: Boolean; colorSpaceName_: NSString; bitmapFormat_: NSBitmapFormat; rBytes: NSInteger; pBits: NSInteger): id; message 'initWithBitmapDataPlanes:pixelsWide:pixelsHigh:bitsPerSample:samplesPerPixel:hasAlpha:isPlanar:colorSpaceName:bitmapFormat:bytesPerRow:bitsPerPixel:';
@@ -169,15 +167,15 @@ var
     function colorSpace: NSColorSpace; message 'colorSpace';
     function bitmapImageRepByConvertingToColorSpace_renderingIntent(targetSpace: NSColorSpace; renderingIntent: NSColorRenderingIntent): NSBitmapImageRep; message 'bitmapImageRepByConvertingToColorSpace:renderingIntent:';
     function bitmapImageRepByRetaggingWithColorSpace(newSpace: NSColorSpace): NSBitmapImageRep; message 'bitmapImageRepByRetaggingWithColorSpace:';
-  end; external;
+  end;
 
 { NSBitmapImageFileTypeExtensionsCategory }
-  NSBitmapImageFileTypeExtensionsCategory = objccategory(NSBitmapImageRep)
+  NSBitmapImageFileTypeExtensionsCategory = objccategory external (NSBitmapImageRep)
     class function representationOfImageRepsInArray_usingType_properties(imageReps: NSArray; storageType: NSBitmapImageFileType; properties: NSDictionary): NSData; message 'representationOfImageRepsInArray:usingType:properties:';
     function representationUsingType_properties(storageType: NSBitmapImageFileType; properties: NSDictionary): NSData; message 'representationUsingType:properties:';
     procedure setProperty_withValue(property_: NSString; value: id); message 'setProperty:withValue:';
     function valueForProperty(property_: NSString): id; message 'valueForProperty:';
-  end; external;
+  end;
 
 {$endif}
 {$endif}

packages/cocoaint/src/appkit/NSBox.inc

@@ -1,5 +1,5 @@
 { Parsed from Appkit.framework NSBox.h }
-{ Version: 2.1.2 - Wed Dec 8 10:06:06 CET 2010 }
+{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
 
 
 {$ifdef TYPES}
@@ -67,7 +67,7 @@ type
 {$define NSBOX_PAS_C}
 
 { NSBox }
-  NSBox = objcclass(NSView)
+  NSBox = objcclass external (NSView)
   private
     _titleCell: id;
     _contentView: id;
@@ -92,8 +92,6 @@ type
     _unused: id;
     
   public
-    class function alloc: NSBox; message 'alloc';
-
     function borderType: NSBorderType; message 'borderType';
     function titlePosition: NSTitlePosition; message 'titlePosition';
     procedure setBorderType(aType: NSBorderType); message 'setBorderType:';
@@ -115,15 +113,15 @@ type
     procedure setContentView(aView: NSView); message 'setContentView:';
     function isTransparent: Boolean; message 'isTransparent';
     procedure setTransparent(flag: Boolean); message 'setTransparent:';
-  end; external;
+  end;
 
 { NSKeyboardUI_NSBoxCategory }
-  NSKeyboardUI_NSBoxCategory = objccategory(NSBox)
+  NSKeyboardUI_NSBoxCategory = objccategory external name 'NSKeyboardUI' (NSBox)
     procedure setTitleWithMnemonic(stringWithAmpersand: NSString); message 'setTitleWithMnemonic:';
-  end; external name 'NSKeyboardUI';
+  end;
 
 { NSCustomBoxTypePropertiesCategory }
-  NSCustomBoxTypePropertiesCategory = objccategory(NSBox)
+  NSCustomBoxTypePropertiesCategory = objccategory external (NSBox)
     function borderWidth: CGFloat; message 'borderWidth';
     procedure setBorderWidth(borderWidth_: CGFloat); message 'setBorderWidth:';
     function cornerRadius: CGFloat; message 'cornerRadius';
@@ -132,7 +130,7 @@ type
     procedure setBorderColor(borderColor_: NSColor); message 'setBorderColor:';
     function fillColor: NSColor; message 'fillColor';
     procedure setFillColor(fillColor_: NSColor); message 'setFillColor:';
-  end; external;
+  end;
 
 {$endif}
 {$endif}

packages/cocoaint/src/appkit/NSBrowser.inc

@@ -1,5 +1,5 @@
 { Parsed from Appkit.framework NSBrowser.h }
-{ Version: 2.1.2 - Wed Dec 8 10:06:06 CET 2010 }
+{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
 
 
 {$ifdef TYPES}
@@ -135,7 +135,7 @@ var
 {$define NSBROWSER_PAS_C}
 
 { NSBrowser }
-  NSBrowser = objcclass(NSControl)
+  NSBrowser = objcclass external (NSControl)
   private
     _target: id;
     _action: SEL;
@@ -157,8 +157,6 @@ var
     _brflags: _Brflags;
     
   public
-    class function alloc: NSBrowser; message 'alloc';
-
     class function cellClass: Pobjc_class; message 'cellClass';
     procedure loadColumnZero; message 'loadColumnZero';
     function isLoaded: Boolean; message 'isLoaded';
@@ -273,17 +271,17 @@ var
     procedure setBackgroundColor(color: NSColor); message 'setBackgroundColor:';
     function backgroundColor: NSColor; message 'backgroundColor';
     procedure editItemAtIndexPath_withEvent_select(indexPath: NSIndexPath; theEvent: NSEvent; select: Boolean); message 'editItemAtIndexPath:withEvent:select:';
-  end; external;
+  end;
 
 { NSDeprecated_NSBrowserCategory }
-  NSDeprecated_NSBrowserCategory = objccategory(NSBrowser)
+  NSDeprecated_NSBrowserCategory = objccategory external name 'NSDeprecated' (NSBrowser)
     procedure setAcceptsArrowKeys(flag: Boolean); message 'setAcceptsArrowKeys:'; deprecated 'in Mac OS X 10.6 and later';
     function acceptsArrowKeys: Boolean; message 'acceptsArrowKeys'; deprecated 'in Mac OS X 10.6 and later';
     procedure displayColumn(column: NSInteger); message 'displayColumn:'; deprecated 'in Mac OS X 10.3 and later';
     procedure displayAllColumns; message 'displayAllColumns'; deprecated 'in Mac OS X 10.3 and later';
     procedure scrollViaScroller(sender: NSScroller); message 'scrollViaScroller:'; deprecated 'in Mac OS X 10.3 and later';
     procedure updateScroller; message 'updateScroller'; deprecated 'in Mac OS X 10.3 and later';
-  end; external name 'NSDeprecated';
+  end;
 
 {$endif}
 {$endif}
@@ -292,7 +290,7 @@ var
 {$define NSBROWSER_PAS_P}
   
 { NSBrowserDelegate Protocol }
-  NSBrowserDelegateProtocol = objcprotocol
+  NSBrowserDelegateProtocol = objcprotocol external name 'NSBrowserDelegate'
     function browser_numberOfRowsInColumn(sender: NSBrowser; column: NSInteger): NSInteger; message 'browser:numberOfRowsInColumn:';
     procedure browser_createRowsForColumn_inMatrix(sender: NSBrowser; column: NSInteger; matrix: NSMatrix); message 'browser:createRowsForColumn:inMatrix:';
     function browser_numberOfChildrenOfItem(browser: NSBrowser; item: id): NSInteger; message 'browser:numberOfChildrenOfItem:';
@@ -327,6 +325,6 @@ var
     function browser_headerViewControllerForItem(browser: NSBrowser; item: id): NSViewController; message 'browser:headerViewControllerForItem:';
     procedure browser_didChangeLastColumn_toColumn(browser: NSBrowser; oldLastColumn: NSInteger; column: NSInteger); message 'browser:didChangeLastColumn:toColumn:';
     function browser_selectionIndexesForProposedSelection_inColumn(browser: NSBrowser; proposedSelectionIndexes: NSIndexSet; column: NSInteger): NSIndexSet; message 'browser:selectionIndexesForProposedSelection:inColumn:';
-  end; external name 'NSBrowserDelegate';
+  end;
 {$endif}
 {$endif}

packages/cocoaint/src/appkit/NSBrowserCell.inc

@@ -1,5 +1,5 @@
 { Parsed from Appkit.framework NSBrowserCell.h }
-{ Version: 2.1.2 - Wed Dec 8 10:06:06 CET 2010 }
+{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
 
 
 {$ifdef TYPES}
@@ -42,11 +42,9 @@
 {$define NSBROWSERCELL_PAS_C}
 
 { NSBrowserCell }
-  NSBrowserCell = objcclass(NSCell)
+  NSBrowserCell = objcclass external (NSCell)
     
   public
-    class function alloc: NSBrowserCell; message 'alloc';
-
     class function branchImage: NSImage; message 'branchImage';
     class function highlightedBranchImage: NSImage; message 'highlightedBranchImage';
     function highlightColorInView(controlView_: NSView): NSColor; message 'highlightColorInView:';
@@ -60,7 +58,7 @@
     function image: NSImage; message 'image';
     procedure setAlternateImage(newAltImage: NSImage); message 'setAlternateImage:';
     function alternateImage: NSImage; message 'alternateImage';
-  end; external;
+  end;
 
 {$endif}
 {$endif}

packages/cocoaint/src/appkit/NSButton.inc

@@ -1,5 +1,5 @@
 { Parsed from Appkit.framework NSButton.h }
-{ Version: 2.1.2 - Wed Dec 8 10:06:06 CET 2010 }
+{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
 
 
 {$ifdef TYPES}
@@ -42,11 +42,9 @@
 {$define NSBUTTON_PAS_C}
 
 { NSButton }
-  NSButton = objcclass(NSControl, NSUserInterfaceValidationsProtocol)
+  NSButton = objcclass external (NSControl, NSUserInterfaceValidationsProtocol)
     
   public
-    class function alloc: NSButton; message 'alloc';
-
     function title: NSString; message 'title';
     procedure setTitle(aString: NSString); message 'setTitle:';
     function alternateTitle: NSString; message 'alternateTitle';
@@ -75,45 +73,45 @@
 
     { Adopted Protocols }
     function validateUserInterfaceItem(anItem: id): Boolean;
-  end; external;
+  end;
 
 { NSKeyboardUI_NSButtonCategory }
-  NSKeyboardUI_NSButtonCategory = objccategory(NSButton)
+  NSKeyboardUI_NSButtonCategory = objccategory external name 'NSKeyboardUI' (NSButton)
     procedure setTitleWithMnemonic(stringWithAmpersand: NSString); message 'setTitleWithMnemonic:';
-  end; external name 'NSKeyboardUI';
+  end;
 
 { NSButtonAttributedStringMethodsCategory }
-  NSButtonAttributedStringMethodsCategory = objccategory(NSButton)
+  NSButtonAttributedStringMethodsCategory = objccategory external (NSButton)
     function attributedTitle: NSAttributedString; message 'attributedTitle';
     procedure setAttributedTitle(aString: NSAttributedString); message 'setAttributedTitle:';
     function attributedAlternateTitle: NSAttributedString; message 'attributedAlternateTitle';
     procedure setAttributedAlternateTitle(obj: NSAttributedString); message 'setAttributedAlternateTitle:';
-  end; external;
+  end;
 
 { NSButtonBezelStylesCategory }
-  NSButtonBezelStylesCategory = objccategory(NSButton)
+  NSButtonBezelStylesCategory = objccategory external (NSButton)
     procedure setBezelStyle(bezelStyle_: NSBezelStyle); message 'setBezelStyle:';
     function bezelStyle: NSBezelStyle; message 'bezelStyle';
-  end; external;
+  end;
 
 { NSButtonMixedStateCategory }
-  NSButtonMixedStateCategory = objccategory(NSButton)
+  NSButtonMixedStateCategory = objccategory external (NSButton)
     procedure setAllowsMixedState(flag: Boolean); message 'setAllowsMixedState:';
     function allowsMixedState: Boolean; message 'allowsMixedState';
     procedure setNextState; message 'setNextState';
-  end; external;
+  end;
 
 { NSButtonBorderCategory }
-  NSButtonBorderCategory = objccategory(NSButton)
+  NSButtonBorderCategory = objccategory external (NSButton)
     procedure setShowsBorderOnlyWhileMouseInside(show: Boolean); message 'setShowsBorderOnlyWhileMouseInside:';
     function showsBorderOnlyWhileMouseInside: Boolean; message 'showsBorderOnlyWhileMouseInside';
-  end; external;
+  end;
 
 { NSButtonSoundExtensionsCategory }
-  NSButtonSoundExtensionsCategory = objccategory(NSButton)
+  NSButtonSoundExtensionsCategory = objccategory external (NSButton)
     procedure setSound(aSound: NSSound); message 'setSound:';
     function sound: NSSound; message 'sound';
-  end; external;
+  end;
 
 {$endif}
 {$endif}

packages/cocoaint/src/appkit/NSButtonCell.inc

@@ -1,5 +1,5 @@
 { Parsed from Appkit.framework NSButtonCell.h }
-{ Version: 2.1.2 - Wed Dec 8 10:06:06 CET 2010 }
+{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
 
 
 {$ifdef TYPES}
@@ -167,7 +167,7 @@ __BCFlags2Ptr = ^__BCFlags2;
 {$define NSBUTTONCELL_PAS_C}
 
 { NSButtonCell }
-  NSButtonCell = objcclass(NSActionCell)
+  NSButtonCell = objcclass external (NSActionCell)
   private
     _altContents: NSString;
     _sound: id;
@@ -180,8 +180,6 @@ __BCFlags2Ptr = ^__BCFlags2;
     _alternateImageOrKeyEquivalentFont: id;
     
   public
-    class function alloc: NSButtonCell; message 'alloc';
-
     function title: NSString; message 'title';
     procedure setTitle(aString: NSString); message 'setTitle:';
     function alternateTitle: NSString; message 'alternateTitle';
@@ -214,19 +212,19 @@ __BCFlags2Ptr = ^__BCFlags2;
     procedure drawImage_withFrame_inView(image_: NSImage; frame: NSRect; controlView_: NSView); message 'drawImage:withFrame:inView:';
     function drawTitle_withFrame_inView(title_: NSAttributedString; frame: NSRect; controlView_: NSView): NSRect; message 'drawTitle:withFrame:inView:';
     procedure drawBezelWithFrame_inView(frame: NSRect; controlView_: NSView); message 'drawBezelWithFrame:inView:';
-  end; external;
+  end;
 
 { NSKeyboardUI_NSButtonCellCategory }
-  NSKeyboardUI_NSButtonCellCategory = objccategory(NSButtonCell)
+  NSKeyboardUI_NSButtonCellCategory = objccategory external name 'NSKeyboardUI' (NSButtonCell)
     procedure setTitleWithMnemonic(stringWithAmpersand: NSString); message 'setTitleWithMnemonic:';
     procedure setAlternateTitleWithMnemonic(stringWithAmpersand: NSString); message 'setAlternateTitleWithMnemonic:';
     procedure setAlternateMnemonicLocation(location: NSUInteger); message 'setAlternateMnemonicLocation:';
     function alternateMnemonicLocation: NSUInteger; message 'alternateMnemonicLocation';
     function alternateMnemonic: NSString; message 'alternateMnemonic';
-  end; external name 'NSKeyboardUI';
+  end;
 
 { NSButtonCellExtensionsCategory }
-  NSButtonCellExtensionsCategory = objccategory(NSButtonCell)
+  NSButtonCellExtensionsCategory = objccategory external (NSButtonCell)
     function gradientType: NSGradientType; message 'gradientType';
     procedure setGradientType(type__: NSGradientType); message 'setGradientType:';
     procedure setImageDimsWhenDisabled(flag: Boolean); message 'setImageDimsWhenDisabled:';
@@ -237,27 +235,27 @@ __BCFlags2Ptr = ^__BCFlags2;
     procedure mouseExited(event: NSEvent); message 'mouseExited:';
     function backgroundColor: NSColor; message 'backgroundColor';
     procedure setBackgroundColor(color: NSColor); message 'setBackgroundColor:';
-  end; external;
+  end;
 
 { NSButtonCellAttributedStringMethodsCategory }
-  NSButtonCellAttributedStringMethodsCategory = objccategory(NSButtonCell)
+  NSButtonCellAttributedStringMethodsCategory = objccategory external (NSButtonCell)
     function attributedTitle: NSAttributedString; message 'attributedTitle';
     procedure setAttributedTitle(obj: NSAttributedString); message 'setAttributedTitle:';
     function attributedAlternateTitle: NSAttributedString; message 'attributedAlternateTitle';
     procedure setAttributedAlternateTitle(obj: NSAttributedString); message 'setAttributedAlternateTitle:';
-  end; external;
+  end;
 
 { NSButtonCellBezelStylesCategory }
-  NSButtonCellBezelStylesCategory = objccategory(NSButtonCell)
+  NSButtonCellBezelStylesCategory = objccategory external (NSButtonCell)
     procedure setBezelStyle(bezelStyle_: NSBezelStyle); message 'setBezelStyle:';
     function bezelStyle: NSBezelStyle; message 'bezelStyle';
-  end; external;
+  end;
 
 { NSButtonCellSoundExtensionsCategory }
-  NSButtonCellSoundExtensionsCategory = objccategory(NSButtonCell)
+  NSButtonCellSoundExtensionsCategory = objccategory external (NSButtonCell)
     procedure setSound(aSound: NSSound); message 'setSound:';
     function sound: NSSound; message 'sound';
-  end; external;
+  end;
 
 {$endif}
 {$endif}

packages/cocoaint/src/appkit/NSCIImageRep.inc

@@ -1,5 +1,5 @@
 { Parsed from Appkit.framework NSCIImageRep.h }
-{ Version: 2.1.2 - Wed Dec 8 10:06:06 CET 2010 }
+{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
 
 
 {$ifdef TYPES}
@@ -42,24 +42,22 @@
 {$define NSCIIMAGEREP_PAS_C}
 
 { NSCIImageRep }
-  NSCIImageRep = objcclass(NSImageRep)
+  NSCIImageRep = objcclass external (NSImageRep)
   private
     _ciImage: CIImage;
     
   public
-    class function alloc: NSCIImageRep; message 'alloc';
-
     class function imageRepWithCIImage(image: CIImage): id; message 'imageRepWithCIImage:';
     function initWithCIImage(image: CIImage): id; message 'initWithCIImage:';
     function CIImage: CIImage; message 'CIImage';
-  end; external;
+  end;
 
 { NSAppKitAdditions_CIImageCategory }
-  NSAppKitAdditions_CIImageCategory = objccategory(CIImage)
+  NSAppKitAdditions_CIImageCategory = objccategory external name 'NSAppKitAdditions' (CIImage)
     function initWithBitmapImageRep(bitmapImageRep: NSBitmapImageRep): id; message 'initWithBitmapImageRep:';
     procedure drawInRect_fromRect_operation_fraction(rect: NSRect; fromRect: NSRect; op: NSCompositingOperation; delta: CGFloat); message 'drawInRect:fromRect:operation:fraction:';
     procedure drawAtPoint_fromRect_operation_fraction(point: NSPoint; fromRect: NSRect; op: NSCompositingOperation; delta: CGFloat); message 'drawAtPoint:fromRect:operation:fraction:';
-  end; external name 'NSAppKitAdditions';
+  end;
 
 {$endif}
 {$endif}

packages/cocoaint/src/appkit/NSCachedImageRep.inc

@@ -1,5 +1,5 @@
 { Parsed from Appkit.framework NSCachedImageRep.h }
-{ Version: 2.1.2 - Wed Dec 8 10:06:06 CET 2010 }
+{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
 
 
 {$ifdef TYPES}
@@ -42,20 +42,18 @@
 {$define NSCACHEDIMAGEREP_PAS_C}
 
 { NSCachedImageRep }
-  NSCachedImageRep = objcclass(NSImageRep)
+  NSCachedImageRep = objcclass external (NSImageRep)
   private
     _origin: NSPoint;
     _window: NSWindow;
     _cache: Pointer; {garbage collector: __strong }
     
   public
-    class function alloc: NSCachedImageRep; message 'alloc';
-
     function initWithWindow_rect(win: NSWindow; rect: NSRect): id; message 'initWithWindow:rect:';
     function initWithSize_depth_separate_alpha(size_: NSSize; depth: NSWindowDepth; flag: Boolean; alpha: Boolean): id; message 'initWithSize:depth:separate:alpha:';
     function window: NSWindow; message 'window';
     function rect: NSRect; message 'rect';
-  end; external;
+  end;
 
 {$endif}
 {$endif}

packages/cocoaint/src/appkit/NSCell.inc

@@ -1,5 +1,5 @@
 { Parsed from Appkit.framework NSCell.h }
-{ Version: 2.1.2 - Wed Dec 8 10:06:06 CET 2010 }
+{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
 
 
 {$ifdef TYPES}
@@ -220,15 +220,13 @@ var
 {$define NSCELL_PAS_C}
 
 { NSCell }
-  NSCell = objcclass(NSObject, NSCopyingProtocol, NSCodingProtocol)
+  NSCell = objcclass external (NSObject, NSCopyingProtocol, NSCodingProtocol)
   private
     _contents: id;
     _cFlags: _CFlags;
     _support: id;
     
   public
-    class function alloc: NSCell; message 'alloc';
-
     class function prefersTrackingUntilMouseUp: Boolean; message 'prefersTrackingUntilMouseUp';
     function initTextCell(aString: NSString): id; message 'initTextCell:';
     function initImageCell(image_: NSImage): id; message 'initImageCell:';
@@ -349,10 +347,10 @@ var
     function copyWithZone(zone_: NSZonePtr): id;
     procedure encodeWithCoder(aCoder: NSCoder);
     function initWithCoder(aDecoder: NSCoder): id;
-  end; external;
+  end;
 
 { NSKeyboardUI_NSCellCategory }
-  NSKeyboardUI_NSCellCategory = objccategory(NSCell)
+  NSKeyboardUI_NSCellCategory = objccategory external name 'NSKeyboardUI' (NSCell)
     procedure setRefusesFirstResponder(flag: Boolean); message 'setRefusesFirstResponder:';
     function refusesFirstResponder: Boolean; message 'refusesFirstResponder';
     function acceptsFirstResponder: Boolean; message 'acceptsFirstResponder';
@@ -367,50 +365,50 @@ var
     function focusRingType: NSFocusRingType; message 'focusRingType';
     class function defaultFocusRingType: NSFocusRingType; message 'defaultFocusRingType';
     function wantsNotificationForMarkedText: Boolean; message 'wantsNotificationForMarkedText';
-  end; external name 'NSKeyboardUI';
+  end;
 
 { NSCellAttributedStringMethodsCategory }
-  NSCellAttributedStringMethodsCategory = objccategory(NSCell)
+  NSCellAttributedStringMethodsCategory = objccategory external (NSCell)
     function attributedStringValue: NSAttributedString; message 'attributedStringValue';
     procedure setAttributedStringValue(obj: NSAttributedString); message 'setAttributedStringValue:';
     function allowsEditingTextAttributes: Boolean; message 'allowsEditingTextAttributes';
     procedure setAllowsEditingTextAttributes(flag: Boolean); message 'setAllowsEditingTextAttributes:';
     function importsGraphics: Boolean; message 'importsGraphics';
     procedure setImportsGraphics(flag: Boolean); message 'setImportsGraphics:';
-  end; external;
+  end;
 
 { NSCellMixedStateCategory }
-  NSCellMixedStateCategory = objccategory(NSCell)
+  NSCellMixedStateCategory = objccategory external (NSCell)
     procedure setAllowsMixedState(flag: Boolean); message 'setAllowsMixedState:';
     function allowsMixedState: Boolean; message 'allowsMixedState';
     function nextState: NSInteger; message 'nextState';
     procedure setNextState; message 'setNextState';
-  end; external;
+  end;
 
 { NSCellHitTestCategory }
-  NSCellHitTestCategory = objccategory(NSCell)
+  NSCellHitTestCategory = objccategory external (NSCell)
     function hitTestForEvent_inRect_ofView(event: NSEvent; cellFrame: NSRect; controlView_: NSView): NSUInteger; message 'hitTestForEvent:inRect:ofView:';
-  end; external;
+  end;
 
 { NSCellExpansionCategory }
-  NSCellExpansionCategory = objccategory(NSCell)
+  NSCellExpansionCategory = objccategory external (NSCell)
     function expansionFrameWithFrame_inView(cellFrame: NSRect; view: NSView): NSRect; message 'expansionFrameWithFrame:inView:';
     procedure drawWithExpansionFrame_inView(cellFrame: NSRect; view: NSView); message 'drawWithExpansionFrame:inView:';
-  end; external;
+  end;
 
 { NSCellBackgroundStyleCategory }
-  NSCellBackgroundStyleCategory = objccategory(NSCell)
+  NSCellBackgroundStyleCategory = objccategory external (NSCell)
     function backgroundStyle: NSBackgroundStyle; message 'backgroundStyle';
     procedure setBackgroundStyle(style: NSBackgroundStyle); message 'setBackgroundStyle:';
     function interiorBackgroundStyle: NSBackgroundStyle; message 'interiorBackgroundStyle';
-  end; external;
+  end;
 
 { NSDeprecated_NSCellCategory }
-  NSDeprecated_NSCellCategory = objccategory(NSCell)
+  NSDeprecated_NSCellCategory = objccategory external name 'NSDeprecated' (NSCell)
     function entryType: NSInteger; message 'entryType'; deprecated 'in Mac OS X 10 and later';
     procedure setEntryType(aType: NSInteger); message 'setEntryType:'; deprecated 'in Mac OS X 10 and later';
     procedure setFloatingPointFormat_left_right(autoRange: Boolean; leftDigits: NSUInteger; rightDigits: NSUInteger); message 'setFloatingPointFormat:left:right:'; deprecated 'in Mac OS X 10 and later';
-  end; external name 'NSDeprecated';
+  end;
 
 {$endif}
 {$endif}

packages/cocoaint/src/appkit/NSClipView.inc

@@ -1,5 +1,5 @@
 { Parsed from Appkit.framework NSClipView.h }
-{ Version: 2.1.2 - Wed Dec 8 10:06:06 CET 2010 }
+{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
 
 
 {$ifdef TYPES}
@@ -42,7 +42,7 @@
 {$define NSCLIPVIEW_PAS_C}
 
 { NSClipView }
-  NSClipView = objcclass(NSView)
+  NSClipView = objcclass external (NSView)
   private
     _backgroundColor: NSColor;
     _docView: NSView;
@@ -75,8 +75,6 @@
       end;
     
   public
-    class function alloc: NSClipView; message 'alloc';
-
     procedure setBackgroundColor(color: NSColor); message 'setBackgroundColor:';
     function backgroundColor: NSColor; message 'backgroundColor';
     procedure setDrawsBackground(flag: Boolean); message 'setDrawsBackground:';
@@ -94,13 +92,13 @@
     function autoscroll(theEvent: NSEvent): Boolean; message 'autoscroll:';
     function constrainScrollPoint(newOrigin: NSPoint): NSPoint; message 'constrainScrollPoint:';
     procedure scrollToPoint(newOrigin: NSPoint); message 'scrollToPoint:';
-  end; external;
+  end;
 
 { NSClipViewSuperviewCategory }
-  NSClipViewSuperviewCategory = objccategory(NSView)
+  NSClipViewSuperviewCategory = objccategory external (NSView)
     procedure reflectScrolledClipView(aClipView: NSClipView); message 'reflectScrolledClipView:';
     procedure scrollClipView_toPoint(aClipView: NSClipView; aPoint: NSPoint); message 'scrollClipView:toPoint:';
-  end; external;
+  end;
 
 {$endif}
 {$endif}

packages/cocoaint/src/appkit/NSCollectionView.inc

@@ -1,5 +1,5 @@
 { Parsed from Appkit.framework NSCollectionView.h }
-{ Version: 2.1.2 - Wed Dec 8 10:06:07 CET 2010 }
+{ Version: 2.1.4 - Sun Jan 2 15:08:20 CET 2011 }
 
 
 {$ifdef TYPES}
@@ -57,7 +57,7 @@ const
 {$define NSCOLLECTIONVIEW_PAS_C}
 
 { NSCollectionViewItem }
-  NSCollectionViewItem = objcclass(NSViewController, NSCopyingProtocol)
+  NSCollectionViewItem = objcclass external (NSViewController, NSCopyingProtocol)
   private
     _collectionView: NSCollectionView;
     __cviFlags: bitpacked record
@@ -74,18 +74,16 @@ const
     _reserved2: Pointer;
     
   public
-    class function alloc: NSCollectionViewItem; message 'alloc';
-
     function collectionView: NSCollectionView; message 'collectionView';
     procedure setSelected(flag: Boolean); message 'setSelected:';
     function isSelected: Boolean; message 'isSelected';
 
     { Adopted Protocols }
     function copyWithZone(zone_: NSZonePtr): id;
-  end; external;
+  end;
 
 { NSCollectionView }
-  NSCollectionView = objcclass(NSView)
+  NSCollectionView = objcclass external (NSView)
   private
     _content: NSArray;
     _selectionIndexes: NSMutableIndexSet;
@@ -137,8 +135,6 @@ const
         _reserved: array[0..15] of Pointer;
     
   public
-    class function alloc: NSCollectionView; message 'alloc';
-
     procedure setDelegate(aDelegate: id); message 'setDelegate:';
     function delegate: id; message 'delegate';
     function isFirstResponder: Boolean; message 'isFirstResponder';
@@ -167,7 +163,7 @@ const
     function frameForItemAtIndex(index: NSUInteger): NSRect; message 'frameForItemAtIndex:';
     procedure setDraggingSourceOperationMask_forLocal(dragOperationMask: NSDragOperation; localDestination: Boolean); message 'setDraggingSourceOperationMask:forLocal:';
     function draggingImageForItemsAtIndexes_withEvent_offset(indexes: NSIndexSet; event: NSEvent; dragImageOffset: NSPointPointer): NSImage; message 'draggingImageForItemsAtIndexes:withEvent:offset:';
-  end; external;
+  end;
 
 {$endif}
 {$endif}
@@ -176,13 +172,13 @@ const
 {$define NSCOLLECTIONVIEW_PAS_P}
   
 { NSCollectionViewDelegate Protocol }
-  NSCollectionViewDelegateProtocol = objcprotocol
+  NSCollectionViewDelegateProtocol = objcprotocol external name 'NSCollectionViewDelegate'
     function collectionView_canDragItemsAtIndexes_withEvent(collectionView: NSCollectionView; indexes: NSIndexSet; event: NSEvent): Boolean; message 'collectionView:canDragItemsAtIndexes:withEvent:';
     function collectionView_writeItemsAtIndexes_toPasteboard(collectionView: NSCollectionView; indexes: NSIndexSet; pasteboard: NSPasteboard): Boolean; message 'collectionView:writeItemsAtIndexes:toPasteboard:';
     function collectionView_namesOfPromisedFilesDroppedAtDestination_forDraggedItemsAtIndexes(collectionView: NSCollectionView; dropURL: NSURL; indexes: NSIndexSet): NSArray; message 'collectionView:namesOfPromisedFilesDroppedAtDestination:forDraggedItemsAtIndexes:';
     function collectionView_draggingImageForItemsAtIndexes_withEvent_offset(collectionView: NSCollectionView; indexes: NSIndexSet; event: NSEvent; dragImageOffset: NSPointPointer): NSImage; message 'collectionView:draggingImageForItemsAtIndexes:withEvent:offset:';
     function collectionView_validateDrop_proposedIndex_dropOperation(collectionView: NSCollectionView; draggingInfo: id; proposedDropIndex: NSIntegerPtr; proposedDropOperation: NSCollectionViewDropOperationPtr): NSDragOperation; message 'collectionView:validateDrop:proposedIndex:dropOperation:';
     function collectionView_acceptDrop_index_dropOperation(collectionView: NSCollectionView; draggingInfo: id; index: NSInteger; dropOperation: NSCollectionViewDropOperation): Boolean; message 'collectionView:acceptDrop:index:dropOperation:';
-  end; external name 'NSCollectionViewDelegate';
+  end;
 {$endif}
 {$endif}

packages/cocoaint/src/appkit/NSColor.inc

@@ -1,5 +1,5 @@
 { Parsed from Appkit.framework NSColor.h }
-{ Version: 2.1.2 - Wed Dec 8 10:06:06 CET 2010 }
+{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
 
 
 {$ifdef TYPES}
@@ -50,11 +50,9 @@ var
 {$define NSCOLOR_PAS_C}
 
 { NSColor }
-  NSColor = objcclass(NSObject)
+  NSColor = objcclass external (NSObject)
     
   public
-    class function alloc: NSColor; message 'alloc';
-
     class function colorWithCalibratedWhite_alpha(white: CGFloat; alpha: CGFloat): NSColor; message 'colorWithCalibratedWhite:alpha:';
     class function colorWithCalibratedHue_saturation_brightness_alpha(hue: CGFloat; saturation: CGFloat; brightness: CGFloat; alpha: CGFloat): NSColor; message 'colorWithCalibratedHue:saturation:brightness:alpha:';
     class function colorWithCalibratedRed_green_blue_alpha(red: CGFloat; green: CGFloat; blue: CGFloat; alpha: CGFloat): NSColor; message 'colorWithCalibratedRed:green:blue:alpha:';
@@ -154,22 +152,22 @@ var
     procedure drawSwatchInRect(rect: NSRect); message 'drawSwatchInRect:';
     class procedure setIgnoresAlpha(flag: Boolean); message 'setIgnoresAlpha:';
     class function ignoresAlpha: Boolean; message 'ignoresAlpha';
-  end; external;
+  end;
 
 { NSQuartzCoreAdditions_NSColorCategory }
-  NSQuartzCoreAdditions_NSColorCategory = objccategory(NSColor)
+  NSQuartzCoreAdditions_NSColorCategory = objccategory external name 'NSQuartzCoreAdditions' (NSColor)
     class function colorWithCIColor(color: CIColor): NSColor; message 'colorWithCIColor:';
-  end; external name 'NSQuartzCoreAdditions';
+  end;
 
 { NSAppKitAdditionsCategory }
-  NSAppKitAdditionsCategory = objccategory(CIColor)
+  NSAppKitAdditionsCategory = objccategory external (CIColor)
     function initWithColor(color: NSColor): id; message 'initWithColor:';
-  end; external;
+  end;
 
 { NSAppKitColorExtensionsCategory }
-  NSAppKitColorExtensionsCategory = objccategory(NSCoder)
+  NSAppKitColorExtensionsCategory = objccategory external (NSCoder)
     function decodeNXColor: NSColor; message 'decodeNXColor';
-  end; external;
+  end;
 
 {$endif}
 {$endif}

packages/cocoaint/src/appkit/NSColorList.inc

@@ -1,5 +1,5 @@
 { Parsed from Appkit.framework NSColorList.h }
-{ Version: 2.1.2 - Wed Dec 8 10:06:06 CET 2010 }
+{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
 
 
 {$ifdef TYPES}
@@ -46,7 +46,7 @@ var
 {$define NSCOLORLIST_PAS_C}
 
 { NSColorList }
-  NSColorList = objcclass(NSObject, NSCodingProtocol)
+  NSColorList = objcclass external (NSObject, NSCodingProtocol)
   private
     _keyArray: NSMutableArray;
     _colorArray: NSMutableArray;
@@ -75,8 +75,6 @@ var
     _clAuxiliaryStorage: id;
     
   public
-    class function alloc: NSColorList; message 'alloc';
-
     class function availableColorLists: NSArray; message 'availableColorLists';
     class function colorListNamed(name_: NSString): NSColorList; message 'colorListNamed:';
     function initWithName(name_: NSString): id; message 'initWithName:';
@@ -94,7 +92,7 @@ var
     { Adopted Protocols }
     procedure encodeWithCoder(aCoder: NSCoder);
     function initWithCoder(aDecoder: NSCoder): id;
-  end; external;
+  end;
 
 {$endif}
 {$endif}

packages/cocoaint/src/appkit/NSColorPanel.inc

@@ -1,5 +1,5 @@
 { Parsed from Appkit.framework NSColorPanel.h }
-{ Version: 2.1.2 - Wed Dec 8 10:06:06 CET 2010 }
+{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
 
 
 {$ifdef TYPES}
@@ -75,7 +75,7 @@ var
 {$define NSCOLORPANEL_PAS_C}
 
 { NSColorPanel }
-  NSColorPanel = objcclass(NSPanel)
+  NSColorPanel = objcclass external (NSPanel)
   private
     _colorSwatch: id;
     _reserved1: id;
@@ -110,8 +110,6 @@ var
     _opacityTextController: id;
     
   public
-    class function alloc: NSColorPanel; message 'alloc';
-
     class function sharedColorPanel: NSColorPanel; message 'sharedColorPanel';
     class function sharedColorPanelExists: Boolean; message 'sharedColorPanelExists';
     class function dragColor_withEvent_fromView(color_: NSColor; theEvent: NSEvent; sourceView: NSView): Boolean; message 'dragColor:withEvent:fromView:';
@@ -132,17 +130,17 @@ var
     procedure setTarget(anObject: id); message 'setTarget:';
     procedure attachColorList(colorList: NSColorList); message 'attachColorList:';
     procedure detachColorList(colorList: NSColorList); message 'detachColorList:';
-  end; external;
+  end;
 
 { NSColorPanel_NSApplicationCategory }
-  NSColorPanel_NSApplicationCategory = objccategory(NSApplication)
+  NSColorPanel_NSApplicationCategory = objccategory external name 'NSColorPanel' (NSApplication)
     procedure orderFrontColorPanel(sender: id); message 'orderFrontColorPanel:';
-  end; external name 'NSColorPanel';
+  end;
 
 { NSColorPanelResponderMethodCategory }
-  NSColorPanelResponderMethodCategory = objccategory(NSObject)
+  NSColorPanelResponderMethodCategory = objccategory external (NSObject)
     procedure changeColor(sender: id); message 'changeColor:';
-  end; external;
+  end;
 
 {$endif}
 {$endif}

packages/cocoaint/src/appkit/NSColorPicker.inc

@@ -1,5 +1,5 @@
 { Parsed from Appkit.framework NSColorPicker.h }
-{ Version: 2.1.2 - Wed Dec 8 10:06:06 CET 2010 }
+{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
 
 
 {$ifdef TYPES}
@@ -42,15 +42,13 @@
 {$define NSCOLORPICKER_PAS_C}
 
 { NSColorPicker }
-  NSColorPicker = objcclass(NSObject, NSColorPickingDefaultProtocol)
+  NSColorPicker = objcclass external (NSObject, NSColorPickingDefaultProtocol)
   private
     _imageObject: id;
     _colorPanel: NSColorPanel;
     _buttonToolTip: NSString;
     
   public
-    class function alloc: NSColorPicker; message 'alloc';
-
     function initWithPickerMask_colorPanel(mask: NSUInteger; owningColorPanel: NSColorPanel): id; message 'initWithPickerMask:colorPanel:';
     function colorPanel: NSColorPanel; message 'colorPanel';
     function provideNewButtonImage: NSImage; message 'provideNewButtonImage';
@@ -64,7 +62,7 @@
 
     { Adopted Protocols }
     procedure alphaControlAddedOrRemoved(sender: id);
-  end; external;
+  end;
 
 {$endif}
 {$endif}

packages/cocoaint/src/appkit/NSColorPicking.inc

@@ -1,5 +1,5 @@
 { Parsed from Appkit.framework NSColorPicking.h }
-{ Version: 2.1.2 - Wed Dec 8 10:06:06 CET 2010 }
+{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
 
 
 {$ifdef TYPES}
@@ -40,7 +40,7 @@
 {$define NSCOLORPICKING_PAS_P}
   
 { NSColorPickingDefault Protocol }
-  NSColorPickingDefaultProtocol = objcprotocol
+  NSColorPickingDefaultProtocol = objcprotocol external name 'NSColorPickingDefault'
     function initWithPickerMask_colorPanel(mask: NSUInteger; owningColorPanel: NSColorPanel): id; message 'initWithPickerMask:colorPanel:';
     function provideNewButtonImage: NSImage; message 'provideNewButtonImage';
     procedure insertNewButtonImage_in(newButtonImage: NSImage; buttonCell: NSButtonCell); message 'insertNewButtonImage:in:';
@@ -51,14 +51,14 @@
     procedure setMode(mode: NSColorPanelMode); message 'setMode:';
     function buttonToolTip: NSString; message 'buttonToolTip';
     function minContentSize: NSSize; message 'minContentSize';
-  end; external name 'NSColorPickingDefault';
+  end;
   
 { NSColorPickingCustom Protocol }
-  NSColorPickingCustomProtocol = objcprotocol
+  NSColorPickingCustomProtocol = objcprotocol external name 'NSColorPickingCustom'
     function supportsMode(mode: NSColorPanelMode): Boolean; message 'supportsMode:';
     function currentMode: NSColorPanelMode; message 'currentMode';
     function provideNewView(initialRequest: Boolean): NSView; message 'provideNewView:';
     procedure setColor(newColor: NSColor); message 'setColor:';
-  end; external name 'NSColorPickingCustom';
+  end;
 {$endif}
 {$endif}

packages/cocoaint/src/appkit/NSColorSpace.inc

@@ -1,5 +1,5 @@
 { Parsed from Appkit.framework NSColorSpace.h }
-{ Version: 2.1.2 - Wed Dec 8 10:06:06 CET 2010 }
+{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
 
 
 {$ifdef TYPES}
@@ -59,7 +59,7 @@ type
 {$define NSCOLORSPACE_PAS_C}
 
 { NSColorSpace }
-  NSColorSpace = objcclass(NSObject, NSCodingProtocol)
+  NSColorSpace = objcclass external (NSObject, NSCodingProtocol)
   private
     _profile: id;
     __flags: bitpacked record
@@ -79,8 +79,6 @@ type
         _reserved: array[0..4] of Pointer;
     
   public
-    class function alloc: NSColorSpace; message 'alloc';
-
     function initWithICCProfileData(iccData: NSData): id; message 'initWithICCProfileData:';
     function ICCProfileData: NSData; message 'ICCProfileData';
     function initWithColorSyncProfile(prof: Pointer): id; message 'initWithColorSyncProfile:';
@@ -104,7 +102,7 @@ type
     { Adopted Protocols }
     procedure encodeWithCoder(aCoder: NSCoder);
     function initWithCoder(aDecoder: NSCoder): id;
-  end; external;
+  end;
 
 {$endif}
 {$endif}

packages/cocoaint/src/appkit/NSColorWell.inc

@@ -1,5 +1,5 @@
 { Parsed from Appkit.framework NSColorWell.h }
-{ Version: 2.1.2 - Wed Dec 8 10:06:06 CET 2010 }
+{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
 
 
 {$ifdef TYPES}
@@ -42,7 +42,7 @@
 {$define NSCOLORWELL_PAS_C}
 
 { NSColorWell }
-  NSColorWell = objcclass(NSControl)
+  NSColorWell = objcclass external (NSControl)
   private
     _color: NSColor;
     _target: id;
@@ -60,8 +60,6 @@
       end;
     
   public
-    class function alloc: NSColorWell; message 'alloc';
-
     procedure deactivate; message 'deactivate';
     procedure activate(exclusive: Boolean); message 'activate:';
     function isActive: Boolean; message 'isActive';
@@ -71,7 +69,7 @@
     procedure takeColorFrom(sender: id); message 'takeColorFrom:';
     procedure setColor(color_: NSColor); message 'setColor:';
     function color: NSColor; message 'color';
-  end; external;
+  end;
 
 {$endif}
 {$endif}

packages/cocoaint/src/appkit/NSComboBox.inc

@@ -1,5 +1,5 @@
 { Parsed from Appkit.framework NSComboBox.h }
-{ Version: 2.1.2 - Wed Dec 8 10:06:06 CET 2010 }
+{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
 
 
 {$ifdef TYPES}
@@ -51,13 +51,11 @@ var
 {$define NSCOMBOBOX_PAS_C}
 
 { NSComboBox }
-  NSComboBox = objcclass(NSTextField)
+  NSComboBox = objcclass external (NSTextField)
   private
     _dataSource: id;
     
   public
-    class function alloc: NSComboBox; message 'alloc';
-
     function hasVerticalScroller: Boolean; message 'hasVerticalScroller';
     procedure setHasVerticalScroller(flag: Boolean); message 'setHasVerticalScroller:';
     function intercellSpacing: NSSize; message 'intercellSpacing';
@@ -95,7 +93,7 @@ var
     function objectValueOfSelectedItem: id; message 'objectValueOfSelectedItem';
     function indexOfItemWithObjectValue(object_: id): NSInteger; message 'indexOfItemWithObjectValue:';
     function objectValues: NSArray; message 'objectValues';
-  end; external;
+  end;
 
 {$endif}
 {$endif}
@@ -104,19 +102,19 @@ var
 {$define NSCOMBOBOX_PAS_P}
   
 { NSComboBoxDataSource Protocol }
-  NSComboBoxDataSourceProtocol = objcprotocol
+  NSComboBoxDataSourceProtocol = objcprotocol external name 'NSComboBoxDataSource'
     function numberOfItemsInComboBox(aComboBox: NSComboBox): NSInteger; message 'numberOfItemsInComboBox:';
     function comboBox_objectValueForItemAtIndex(aComboBox: NSComboBox; index: NSInteger): id; message 'comboBox:objectValueForItemAtIndex:';
     function comboBox_indexOfItemWithStringValue(aComboBox: NSComboBox; string_: NSString): NSUInteger; message 'comboBox:indexOfItemWithStringValue:';
     function comboBox_completedString(aComboBox: NSComboBox; string_: NSString): NSString; message 'comboBox:completedString:';
-  end; external name 'NSComboBoxDataSource';
+  end;
   
 { NSComboBoxDelegate Protocol }
-  NSComboBoxDelegateProtocol = objcprotocol
+  NSComboBoxDelegateProtocol = objcprotocol external name 'NSComboBoxDelegate'
     procedure comboBoxWillPopUp(notification: NSNotification); message 'comboBoxWillPopUp:';
     procedure comboBoxWillDismiss(notification: NSNotification); message 'comboBoxWillDismiss:';
     procedure comboBoxSelectionDidChange(notification: NSNotification); message 'comboBoxSelectionDidChange:';
     procedure comboBoxSelectionIsChanging(notification: NSNotification); message 'comboBoxSelectionIsChanging:';
-  end; external name 'NSComboBoxDelegate';
+  end;
 {$endif}
 {$endif}

packages/cocoaint/src/appkit/NSComboBoxCell.inc

@@ -1,5 +1,5 @@
 { Parsed from Appkit.framework NSComboBoxCell.h }
-{ Version: 2.1.2 - Wed Dec 8 10:06:06 CET 2010 }
+{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
 
 
 {$ifdef TYPES}
@@ -43,7 +43,7 @@
 {$define NSCOMBOBOXCELL_PAS_C}
 
 { NSComboBoxCell }
-  NSComboBoxCell = objcclass(NSTextFieldCell)
+  NSComboBoxCell = objcclass external (NSTextFieldCell)
   private
     _delegate: id;
     _dataSource: id;
@@ -71,8 +71,7 @@
     _reserved: Pointer;
     
   public
-    class function alloc: NSComboBoxCell; message 'alloc';
-  end; external;
+  end;
 
 {$endif}
 {$endif}
@@ -81,11 +80,11 @@
 {$define NSCOMBOBOXCELL_PAS_P}
   
 { NSComboBoxCellDataSource Protocol }
-  NSComboBoxCellDataSourceProtocol = objcprotocol
+  NSComboBoxCellDataSourceProtocol = objcprotocol external name 'NSComboBoxCellDataSource'
     function numberOfItemsInComboBoxCell(comboBoxCell: NSComboBoxCell): NSInteger; message 'numberOfItemsInComboBoxCell:';
     function comboBoxCell_objectValueForItemAtIndex(aComboBoxCell: NSComboBoxCell; index: NSInteger): id; message 'comboBoxCell:objectValueForItemAtIndex:';
     function comboBoxCell_indexOfItemWithStringValue(aComboBoxCell: NSComboBoxCell; string_: NSString): NSUInteger; message 'comboBoxCell:indexOfItemWithStringValue:';
     function comboBoxCell_completedString(aComboBoxCell: NSComboBoxCell; uncompletedString: NSString): NSString; message 'comboBoxCell:completedString:';
-  end; external name 'NSComboBoxCellDataSource';
+  end;
 {$endif}
 {$endif}

packages/cocoaint/src/appkit/NSControl.inc

@@ -1,5 +1,5 @@
 { Parsed from Appkit.framework NSControl.h }
-{ Version: 2.1.2 - Wed Dec 8 10:06:06 CET 2010 }
+{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
 
 
 {$ifdef TYPES}
@@ -49,7 +49,7 @@ var
 {$define NSCONTROL_PAS_C}
 
 { NSControl }
-  NSControl = objcclass(NSView)
+  NSControl = objcclass external (NSView)
   private
     _tag: NSInteger;
     _cell: id;
@@ -68,8 +68,6 @@ var
       end;
     
   public
-    class function alloc: NSControl; message 'alloc';
-
     class procedure setCellClass(factoryId: Pobjc_class); message 'setCellClass:';
     class function cellClass: Pobjc_class; message 'cellClass';
     function initWithFrame(frameRect: NSRect): id; message 'initWithFrame:';
@@ -129,32 +127,32 @@ var
     function integerValue: NSInteger; message 'integerValue';
     procedure setIntegerValue(anInteger: NSInteger); message 'setIntegerValue:';
     procedure takeIntegerValueFrom(sender: id); message 'takeIntegerValueFrom:';
-  end; external;
+  end;
 
 { NSKeyboardUI_NSControlCategory }
-  NSKeyboardUI_NSControlCategory = objccategory(NSControl)
+  NSKeyboardUI_NSControlCategory = objccategory external name 'NSKeyboardUI' (NSControl)
     procedure performClick(sender: id); message 'performClick:';
     procedure setRefusesFirstResponder(flag: Boolean); message 'setRefusesFirstResponder:';
     function refusesFirstResponder: Boolean; message 'refusesFirstResponder';
-  end; external name 'NSKeyboardUI';
+  end;
 
 { NSControlSubclassNotificationsCategory }
-  NSControlSubclassNotificationsCategory = objccategory(NSObject)
+  NSControlSubclassNotificationsCategory = objccategory external (NSObject)
     procedure controlTextDidBeginEditing(obj: NSNotification); message 'controlTextDidBeginEditing:';
     procedure controlTextDidEndEditing(obj: NSNotification); message 'controlTextDidEndEditing:';
     procedure controlTextDidChange(obj: NSNotification); message 'controlTextDidChange:';
-  end; external;
+  end;
 
 { NSControlAttributedStringMethodsCategory }
-  NSControlAttributedStringMethodsCategory = objccategory(NSControl)
+  NSControlAttributedStringMethodsCategory = objccategory external (NSControl)
     function attributedStringValue: NSAttributedString; message 'attributedStringValue';
     procedure setAttributedStringValue(obj: NSAttributedString); message 'setAttributedStringValue:';
-  end; external;
+  end;
 
 { NSDeprecated_NSControlCategory }
-  NSDeprecated_NSControlCategory = objccategory(NSControl)
+  NSDeprecated_NSControlCategory = objccategory external name 'NSDeprecated' (NSControl)
     procedure setFloatingPointFormat_left_right(autoRange: Boolean; leftDigits: NSUInteger; rightDigits: NSUInteger); message 'setFloatingPointFormat:left:right:'; deprecated 'in Mac OS X 10 and later';
-  end; external name 'NSDeprecated';
+  end;
 
 {$endif}
 {$endif}
@@ -163,7 +161,7 @@ var
 {$define NSCONTROL_PAS_P}
   
 { NSControlTextEditingDelegate Protocol }
-  NSControlTextEditingDelegateProtocol = objcprotocol
+  NSControlTextEditingDelegateProtocol = objcprotocol external name 'NSControlTextEditingDelegate'
     function control_textShouldBeginEditing(control: NSControl; fieldEditor: NSText): Boolean; message 'control:textShouldBeginEditing:';
     function control_textShouldEndEditing(control: NSControl; fieldEditor: NSText): Boolean; message 'control:textShouldEndEditing:';
     function control_didFailToFormatString_errorDescription(control: NSControl; string_: NSString; error: NSString): Boolean; message 'control:didFailToFormatString:errorDescription:';
@@ -171,6 +169,6 @@ var
     function control_isValidObject(control: NSControl; obj: id): Boolean; message 'control:isValidObject:';
     function control_textView_doCommandBySelector(control: NSControl; textView: NSTextView; commandSelector: SEL): Boolean; message 'control:textView:doCommandBySelector:';
     function control_textView_completions_forPartialWordRange_indexOfSelectedItem(control: NSControl; textView: NSTextView; words: NSArray; charRange: NSRange; index: NSIntegerPtr): NSArray; message 'control:textView:completions:forPartialWordRange:indexOfSelectedItem:';
-  end; external name 'NSControlTextEditingDelegate';
+  end;
 {$endif}
 {$endif}

packages/cocoaint/src/appkit/NSController.inc

@@ -1,5 +1,5 @@
 { Parsed from Appkit.framework NSController.h }
-{ Version: 2.1.2 - Wed Dec 8 10:06:06 CET 2010 }
+{ Version: 2.1.4 - Sun Jan 2 15:08:20 CET 2011 }
 
 
 {$ifdef TYPES}
@@ -42,7 +42,7 @@
 {$define NSCONTROLLER_PAS_C}
 
 { NSController }
-  NSController = objcclass(NSObject, NSCodingProtocol)
+  NSController = objcclass external (NSObject, NSCodingProtocol)
   private
     _reserved: Pointer;
     _reserved2: Pointer;
@@ -70,8 +70,6 @@
     _singleValueAccessor: id;
     
   public
-    class function alloc: NSController; message 'alloc';
-
     procedure objectDidBeginEditing(editor: id); message 'objectDidBeginEditing:';
     procedure objectDidEndEditing(editor: id); message 'objectDidEndEditing:';
     procedure discardEditing; message 'discardEditing';
@@ -82,7 +80,7 @@
     { Adopted Protocols }
     procedure encodeWithCoder(aCoder: NSCoder);
     function initWithCoder(aDecoder: NSCoder): id;
-  end; external;
+  end;
 
 {$endif}
 {$endif}

packages/cocoaint/src/appkit/NSCursor.inc

@@ -1,5 +1,5 @@
 { Parsed from Appkit.framework NSCursor.h }
-{ Version: 2.1.2 - Wed Dec 8 10:06:06 CET 2010 }
+{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
 
 
 {$ifdef TYPES}
@@ -46,7 +46,7 @@ const
 {$define NSCURSOR_PAS_C}
 
 { NSCursor }
-  NSCursor = objcclass(NSObject, NSCodingProtocol)
+  NSCursor = objcclass external (NSObject, NSCodingProtocol)
   private
     _hotSpot: NSPoint;
     __flags: bitpacked record
@@ -62,8 +62,6 @@ const
     _image: id;
     
   public
-    class function alloc: NSCursor; message 'alloc';
-
     class function currentCursor: NSCursor; message 'currentCursor';
     class function currentSystemCursor: NSCursor; message 'currentSystemCursor';
     class function arrowCursor: NSCursor; message 'arrowCursor';
@@ -103,7 +101,7 @@ const
     { Adopted Protocols }
     procedure encodeWithCoder(aCoder: NSCoder);
     function initWithCoder(aDecoder: NSCoder): id;
-  end; external;
+  end;
 
 {$endif}
 {$endif}

packages/cocoaint/src/appkit/NSCustomImageRep.inc

@@ -1,5 +1,5 @@
 { Parsed from Appkit.framework NSCustomImageRep.h }
-{ Version: 2.1.2 - Wed Dec 8 10:06:06 CET 2010 }
+{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
 
 
 {$ifdef TYPES}
@@ -42,19 +42,17 @@
 {$define NSCUSTOMIMAGEREP_PAS_C}
 
 { NSCustomImageRep }
-  NSCustomImageRep = objcclass(NSImageRep)
+  NSCustomImageRep = objcclass external (NSImageRep)
   private
     _drawMethod: SEL;
     _drawObject: id;
     _reserved: cuint;
     
   public
-    class function alloc: NSCustomImageRep; message 'alloc';
-
     function initWithDrawSelector_delegate(aMethod: SEL; anObject: id): id; message 'initWithDrawSelector:delegate:';
     function drawSelector: SEL; message 'drawSelector';
     function delegate: id; message 'delegate';
-  end; external;
+  end;
 
 {$endif}
 {$endif}

packages/cocoaint/src/appkit/NSDatePicker.inc

@@ -1,5 +1,5 @@
 { Parsed from Appkit.framework NSDatePicker.h }
-{ Version: 2.1.2 - Wed Dec 8 10:06:06 CET 2010 }
+{ Version: 2.1.4 - Sun Jan 2 15:08:20 CET 2011 }
 
 
 {$ifdef TYPES}
@@ -42,11 +42,9 @@
 {$define NSDATEPICKER_PAS_C}
 
 { NSDatePicker }
-  NSDatePicker = objcclass(NSControl)
+  NSDatePicker = objcclass external (NSControl)
     
   public
-    class function alloc: NSDatePicker; message 'alloc';
-
     function datePickerStyle: NSDatePickerStyle; message 'datePickerStyle';
     procedure setDatePickerStyle(newStyle: NSDatePickerStyle); message 'setDatePickerStyle:';
     function isBezeled: Boolean; message 'isBezeled';
@@ -79,7 +77,7 @@
     procedure setMaxDate(date: NSDate); message 'setMaxDate:';
     function delegate: id; message 'delegate';
     procedure setDelegate(anObject: id); message 'setDelegate:';
-  end; external;
+  end;
 
 {$endif}
 {$endif}

packages/cocoaint/src/appkit/NSDatePickerCell.inc

@@ -1,5 +1,5 @@
 { Parsed from Appkit.framework NSDatePickerCell.h }
-{ Version: 2.1.2 - Wed Dec 8 10:06:06 CET 2010 }
+{ Version: 2.1.4 - Sun Jan 2 15:08:20 CET 2011 }
 
 
 {$ifdef TYPES}
@@ -71,7 +71,7 @@ type
 {$define NSDATEPICKERCELL_PAS_C}
 
 { NSDatePickerCell }
-  NSDatePickerCell = objcclass(NSActionCell)
+  NSDatePickerCell = objcclass external (NSActionCell)
   private
     _timeInterval: NSTimeInterval;
     _minDate: NSDate;
@@ -105,8 +105,6 @@ type
     _reserved4: id;
     
   public
-    class function alloc: NSDatePickerCell; message 'alloc';
-
     function datePickerStyle: NSDatePickerStyle; message 'datePickerStyle';
     procedure setDatePickerStyle(newStyle: NSDatePickerStyle); message 'setDatePickerStyle:';
     function drawsBackground: Boolean; message 'drawsBackground';
@@ -135,7 +133,7 @@ type
     procedure setMaxDate(date: NSDate); message 'setMaxDate:';
     function delegate: id; message 'delegate';
     procedure setDelegate(anObject: id); message 'setDelegate:';
-  end; external;
+  end;
 
 {$endif}
 {$endif}
@@ -144,8 +142,8 @@ type
 {$define NSDATEPICKERCELL_PAS_P}
   
 { NSDatePickerCellDelegate Protocol }
-  NSDatePickerCellDelegateProtocol = objcprotocol
+  NSDatePickerCellDelegateProtocol = objcprotocol external name 'NSDatePickerCellDelegate'
     procedure datePickerCell_validateProposedDateValue_timeInterval(aDatePickerCell: NSDatePickerCell; proposedDateValue: NSDatePointer; proposedTimeInterval: NSTimeIntervalPtr); message 'datePickerCell:validateProposedDateValue:timeInterval:';
-  end; external name 'NSDatePickerCellDelegate';
+  end;
 {$endif}
 {$endif}

packages/cocoaint/src/appkit/NSDictionaryController.inc

@@ -1,5 +1,5 @@
 { Parsed from Appkit.framework NSDictionaryController.h }
-{ Version: 2.1.2 - Wed Dec 8 10:06:06 CET 2010 }
+{ Version: 2.1.4 - Sun Jan 2 15:08:20 CET 2011 }
 
 
 {$ifdef TYPES}
@@ -42,7 +42,7 @@
 {$define NSDICTIONARYCONTROLLER_PAS_C}
 
 { NSDictionaryController }
-  NSDictionaryController = objcclass(NSArrayController)
+  NSDictionaryController = objcclass external (NSArrayController)
   private
     _reserved5: Pointer;
     _reserved6: Pointer;
@@ -67,8 +67,6 @@
       end;
     
   public
-    class function alloc: NSDictionaryController; message 'alloc';
-
     function newObject: id; message 'newObject';
     procedure setInitialKey(key: NSString); message 'setInitialKey:';
     function initialKey: NSString; message 'initialKey';
@@ -82,10 +80,10 @@
     function localizedKeyDictionary: NSDictionary; message 'localizedKeyDictionary';
     procedure setLocalizedKeyTable(stringsFileName: NSString); message 'setLocalizedKeyTable:';
     function localizedKeyTable: NSString; message 'localizedKeyTable';
-  end; external;
+  end;
 
 { NSDictionaryControllerKeyValuePairCategory }
-  NSDictionaryControllerKeyValuePairCategory = objccategory(NSObject)
+  NSDictionaryControllerKeyValuePairCategory = objccategory external (NSObject)
     procedure setLocalizedKey(localizedKey: NSString); message 'setLocalizedKey:';
     function localizedKey: NSString; message 'localizedKey';
     procedure setKey(key: NSString); message 'setKey:';
@@ -93,7 +91,7 @@
     procedure setValue(value: id); message 'setValue:';
     function value: id; message 'value';
     function isExplicitlyIncluded: Boolean; message 'isExplicitlyIncluded';
-  end; external;
+  end;
 
 {$endif}
 {$endif}

packages/cocoaint/src/appkit/NSDockTile.inc

@@ -1,5 +1,5 @@
 { Parsed from Appkit.framework NSDockTile.h }
-{ Version: 2.1.2 - Wed Dec 8 10:06:06 CET 2010 }
+{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
 
 
 {$ifdef TYPES}
@@ -47,7 +47,7 @@ const
 {$define NSDOCKTILE_PAS_C}
 
 { NSDockTile }
-  NSDockTile = objcclass(NSObject)
+  NSDockTile = objcclass external (NSObject)
   private
     _owner: id;
     _dockContextRef: Pointer;
@@ -67,8 +67,6 @@ const
         reserved: array[0..4] of id;
     
   public
-    class function alloc: NSDockTile; message 'alloc';
-
     function size: NSSize; message 'size';
     procedure setContentView(view: NSView); message 'setContentView:';
     function contentView: NSView; message 'contentView';
@@ -78,7 +76,7 @@ const
     procedure setBadgeLabel(string_: NSString); message 'setBadgeLabel:';
     function badgeLabel: NSString; message 'badgeLabel';
     function owner: id; message 'owner';
-  end; external;
+  end;
 
 {$endif}
 {$endif}
@@ -87,9 +85,9 @@ const
 {$define NSDOCKTILE_PAS_P}
   
 { NSDockTilePlugIn Protocol }
-  NSDockTilePlugInProtocol = objcprotocol
+  NSDockTilePlugInProtocol = objcprotocol external name 'NSDockTilePlugIn'
     procedure setDockTile(dockTile: NSDockTile); message 'setDockTile:';
     function dockMenu: NSMenu; message 'dockMenu';
-  end; external name 'NSDockTilePlugIn';
+  end;
 {$endif}
 {$endif}

packages/cocoaint/src/appkit/NSDocument.inc

@@ -1,5 +1,5 @@
 { Parsed from Appkit.framework NSDocument.h }
-{ Version: 2.1.2 - Wed Dec 8 10:06:06 CET 2010 }
+{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
 
 
 {$ifdef TYPES}
@@ -65,7 +65,7 @@ type
 {$define NSDOCUMENT_PAS_C}
 
 { NSDocument }
-  NSDocument = objcclass(NSObject, NSUserInterfaceValidationsProtocol)
+  NSDocument = objcclass external (NSObject, NSUserInterfaceValidationsProtocol)
   private
     _window: NSWindow;
     _windowControllers: id;
@@ -96,8 +96,6 @@ type
     _savePanelSaveType: NSString;
     
   public
-    class function alloc: NSDocument; message 'alloc';
-
     function init: id; message 'init';
     function initWithType_error(typeName: NSString; outError: NSErrorPointer): id; message 'initWithType:error:';
     class function canConcurrentlyReadDocumentsOfType(typeName: NSString): Boolean; message 'canConcurrentlyReadDocumentsOfType:';
@@ -178,10 +176,10 @@ type
     function validateUserInterfaceItem(anItem: id): Boolean; message 'validateUserInterfaceItem:';
 
     { Adopted Protocols }
-  end; external;
+  end;
 
 { NSDeprecated_NSDocumentCategory }
-  NSDeprecated_NSDocumentCategory = objccategory(NSDocument)
+  NSDeprecated_NSDocumentCategory = objccategory external name 'NSDeprecated' (NSDocument)
     function dataRepresentationOfType(type_: NSString): NSData; message 'dataRepresentationOfType:'; deprecated 'in Mac OS X 10.4 and later';
     function fileAttributesToWriteToFile_ofType_saveOperation(fullDocumentPath: NSString; documentTypeName: NSString; saveOperationType: NSSaveOperationType): NSDictionary; message 'fileAttributesToWriteToFile:ofType:saveOperation:';
     function fileName: NSString; message 'fileName'; deprecated 'in Mac OS X 10.4 and later';
@@ -202,7 +200,7 @@ type
     function writeToFile_ofType_originalFile_saveOperation(fullDocumentPath: NSString; documentTypeName: NSString; fullOriginalDocumentPath: NSString; saveOperationType: NSSaveOperationType): Boolean; message 'writeToFile:ofType:originalFile:saveOperation:'; deprecated 'in Mac OS X 10.4 and later';
     function writeToURL_ofType(url: NSURL; type_: NSString): Boolean; message 'writeToURL:ofType:'; deprecated 'in Mac OS X 10.4 and later';
     function writeWithBackupToFile_ofType_saveOperation(fullDocumentPath: NSString; documentTypeName: NSString; saveOperationType: NSSaveOperationType): Boolean; message 'writeWithBackupToFile:ofType:saveOperation:'; deprecated 'in Mac OS X 10.4 and later';
-  end; external name 'NSDeprecated';
+  end;
 
 {$endif}
 {$endif}

packages/cocoaint/src/appkit/NSDocumentController.inc

@@ -1,5 +1,5 @@
 { Parsed from Appkit.framework NSDocumentController.h }
-{ Version: 2.1.2 - Wed Dec 8 10:06:06 CET 2010 }
+{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
 
 
 {$ifdef TYPES}
@@ -42,7 +42,7 @@
 {$define NSDOCUMENTCONTROLLER_PAS_C}
 
 { NSDocumentController }
-  NSDocumentController = objcclass(NSObject, NSCodingProtocol, NSUserInterfaceValidationsProtocol)
+  NSDocumentController = objcclass external (NSObject, NSCodingProtocol, NSUserInterfaceValidationsProtocol)
   private
     _documents: id;
     _moreVars: id;
@@ -51,8 +51,6 @@
     _recentsLimit: cint;
     
   public
-    class function alloc: NSDocumentController; message 'alloc';
-
     class function sharedDocumentController: id; message 'sharedDocumentController';
     function init: id; message 'init';
     function documents: NSArray; message 'documents';
@@ -96,10 +94,10 @@
     { Adopted Protocols }
     procedure encodeWithCoder(aCoder: NSCoder);
     function initWithCoder(aDecoder: NSCoder): id;
-  end; external;
+  end;
 
 { NSDeprecated_NSDocumentControllerCategory }
-  NSDeprecated_NSDocumentControllerCategory = objccategory(NSDocumentController)
+  NSDeprecated_NSDocumentControllerCategory = objccategory external name 'NSDeprecated' (NSDocumentController)
     function fileExtensionsFromType(typeName: NSString): NSArray; message 'fileExtensionsFromType:'; deprecated 'in Mac OS X 10.5 and later';
     function typeFromFileExtension(fileNameExtensionOrHFSFileType: NSString): NSString; message 'typeFromFileExtension:'; deprecated 'in Mac OS X 10.5 and later';
     function documentForFileName(fileName: NSString): id; message 'documentForFileName:'; deprecated 'in Mac OS X 10.4 and later';
@@ -112,7 +110,7 @@
     function openUntitledDocumentOfType_display(type_: NSString; display: Boolean): id; message 'openUntitledDocumentOfType:display:'; deprecated 'in Mac OS X 10.4 and later';
     procedure setShouldCreateUI(flag: Boolean); message 'setShouldCreateUI:'; deprecated 'in Mac OS X 10.4 and later';
     function shouldCreateUI: Boolean; message 'shouldCreateUI'; deprecated 'in Mac OS X 10.4 and later';
-  end; external name 'NSDeprecated';
+  end;
 
 {$endif}
 {$endif}

packages/cocoaint/src/appkit/NSDocumentScripting.inc

@@ -1,5 +1,5 @@
 { Parsed from Appkit.framework NSDocumentScripting.h }
-{ Version: 2.1.2 - Wed Dec 8 10:06:06 CET 2010 }
+{ Version: 2.1.4 - Sun Jan 2 15:08:20 CET 2011 }
 
 
 {$ifdef TYPES}
@@ -39,14 +39,14 @@
 {$define NSDOCUMENTSCRIPTING_PAS_C}
 
 { NSScripting_NSDocumentCategory }
-  NSScripting_NSDocumentCategory = objccategory(NSDocument)
+  NSScripting_NSDocumentCategory = objccategory external name 'NSScripting' (NSDocument)
     function lastComponentOfFileName: NSString; message 'lastComponentOfFileName';
     procedure setLastComponentOfFileName(str: NSString); message 'setLastComponentOfFileName:';
     function handleSaveScriptCommand(command: NSScriptCommand): id; message 'handleSaveScriptCommand:';
     function handleCloseScriptCommand(command: NSCloseCommand): id; message 'handleCloseScriptCommand:';
     function handlePrintScriptCommand(command: NSScriptCommand): id; message 'handlePrintScriptCommand:';
     function objectSpecifier: NSScriptObjectSpecifier; message 'objectSpecifier';
-  end; external name 'NSScripting';
+  end;
 
 {$endif}
 {$endif}

packages/cocoaint/src/appkit/NSDragging.inc

@@ -1,5 +1,5 @@
 { Parsed from Appkit.framework NSDragging.h }
-{ Version: 2.1.2 - Wed Dec 8 10:06:06 CET 2010 }
+{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
 
 
 {$ifdef TYPES}
@@ -58,7 +58,7 @@ const
 {$define NSDRAGGING_PAS_C}
 
 { NSDraggingDestinationCategory }
-  NSDraggingDestinationCategory = objccategory(NSObject)
+  NSDraggingDestinationCategory = objccategory external (NSObject)
     function draggingEntered(sender: id): NSDragOperation; message 'draggingEntered:';
     function draggingUpdated(sender: id): NSDragOperation; message 'draggingUpdated:';
     procedure draggingExited(sender: id); message 'draggingExited:';
@@ -67,22 +67,22 @@ const
     procedure concludeDragOperation(sender: id); message 'concludeDragOperation:';
     procedure draggingEnded(sender: id); message 'draggingEnded:';
     function wantsPeriodicDraggingUpdates: Boolean; message 'wantsPeriodicDraggingUpdates';
-  end; external;
+  end;
 
 { NSDraggingSourceCategory }
-  NSDraggingSourceCategory = objccategory(NSObject)
+  NSDraggingSourceCategory = objccategory external (NSObject)
     function draggingSourceOperationMaskForLocal(flag: Boolean): NSDragOperation; message 'draggingSourceOperationMaskForLocal:';
     function namesOfPromisedFilesDroppedAtDestination(dropDestination: NSURL): NSArray; message 'namesOfPromisedFilesDroppedAtDestination:';
     procedure draggedImage_beganAt(image: NSImage; screenPoint: NSPoint); message 'draggedImage:beganAt:';
     procedure draggedImage_endedAt_operation(image: NSImage; screenPoint: NSPoint; operation: NSDragOperation); message 'draggedImage:endedAt:operation:';
     procedure draggedImage_movedTo(image: NSImage; screenPoint: NSPoint); message 'draggedImage:movedTo:';
     function ignoreModifierKeysWhileDragging: Boolean; message 'ignoreModifierKeysWhileDragging';
-  end; external;
+  end;
 
 { NSDraggingSourceDeprecatedCategory }
-  NSDraggingSourceDeprecatedCategory = objccategory(NSObject)
+  NSDraggingSourceDeprecatedCategory = objccategory external (NSObject)
     procedure draggedImage_endedAt_deposited(image: NSImage; screenPoint: NSPoint; flag: Boolean); message 'draggedImage:endedAt:deposited:'; deprecated 'in Mac OS X 10.1 and later';
-  end; external;
+  end;
 
 {$endif}
 {$endif}
@@ -91,7 +91,7 @@ const
 {$define NSDRAGGING_PAS_P}
   
 { NSDraggingInfo Protocol }
-  NSDraggingInfoProtocol = objcprotocol
+  NSDraggingInfoProtocol = objcprotocol external name 'NSDraggingInfo'
     function draggingDestinationWindow: NSWindow; message 'draggingDestinationWindow';
     function draggingSourceOperationMask: NSDragOperation; message 'draggingSourceOperationMask';
     function draggingLocation: NSPoint; message 'draggingLocation';
@@ -102,6 +102,6 @@ const
     function draggingSequenceNumber: NSInteger; message 'draggingSequenceNumber';
     procedure slideDraggedImageTo(screenPoint: NSPoint); message 'slideDraggedImageTo:';
     function namesOfPromisedFilesDroppedAtDestination(dropDestination: NSURL): NSArray; message 'namesOfPromisedFilesDroppedAtDestination:';
-  end; external name 'NSDraggingInfo';
+  end;
 {$endif}
 {$endif}

packages/cocoaint/src/appkit/NSDrawer.inc

@@ -1,5 +1,5 @@
 { Parsed from Appkit.framework NSDrawer.h }
-{ Version: 2.1.2 - Wed Dec 8 10:06:06 CET 2010 }
+{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
 
 
 {$ifdef TYPES}
@@ -63,7 +63,7 @@ var
 {$define NSDRAWER_PAS_C}
 
 { NSDrawer }
-  NSDrawer = objcclass(NSResponder)
+  NSDrawer = objcclass external (NSResponder)
   private
     _drawerState: NSDrawerState;
     _drawerNextState: NSDrawerState;
@@ -88,8 +88,6 @@ var
     _drawerObserver: CFRunLoopObserverRef; {garbage collector: __strong }
     
   public
-    class function alloc: NSDrawer; message 'alloc';
-
     function initWithContentSize_preferredEdge(contentSize_: NSSize; edge_: NSRectEdge): id; message 'initWithContentSize:preferredEdge:';
     procedure setParentWindow(parent: NSWindow); message 'setParentWindow:';
     function parentWindow: NSWindow; message 'parentWindow';
@@ -115,12 +113,12 @@ var
     function leadingOffset: CGFloat; message 'leadingOffset';
     procedure setTrailingOffset(offset: CGFloat); message 'setTrailingOffset:';
     function trailingOffset: CGFloat; message 'trailingOffset';
-  end; external;
+  end;
 
 { DrawersCategory }
-  DrawersCategory = objccategory(NSWindow)
+  DrawersCategory = objccategory external (NSWindow)
     function drawers: NSArray; message 'drawers';
-  end; external;
+  end;
 
 {$endif}
 {$endif}
@@ -129,7 +127,7 @@ var
 {$define NSDRAWER_PAS_P}
   
 { NSDrawerDelegate Protocol }
-  NSDrawerDelegateProtocol = objcprotocol
+  NSDrawerDelegateProtocol = objcprotocol external name 'NSDrawerDelegate'
     function drawerShouldOpen(sender: NSDrawer): Boolean; message 'drawerShouldOpen:';
     function drawerShouldClose(sender: NSDrawer): Boolean; message 'drawerShouldClose:';
     function drawerWillResizeContents_toSize(sender: NSDrawer; contentSize: NSSize): NSSize; message 'drawerWillResizeContents:toSize:';
@@ -137,6 +135,6 @@ var
     procedure drawerDidOpen(notification: NSNotification); message 'drawerDidOpen:';
     procedure drawerWillClose(notification: NSNotification); message 'drawerWillClose:';
     procedure drawerDidClose(notification: NSNotification); message 'drawerDidClose:';
-  end; external name 'NSDrawerDelegate';
+  end;
 {$endif}
 {$endif}

packages/cocoaint/src/appkit/NSEPSImageRep.inc

@@ -1,5 +1,5 @@
 { Parsed from Appkit.framework NSEPSImageRep.h }
-{ Version: 2.1.2 - Wed Dec 8 10:06:06 CET 2010 }
+{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
 
 
 {$ifdef TYPES}
@@ -42,21 +42,19 @@
 {$define NSEPSIMAGEREP_PAS_C}
 
 { NSEPSImageRep }
-  NSEPSImageRep = objcclass(NSImageRep)
+  NSEPSImageRep = objcclass external (NSImageRep)
   private
     _bBoxOrigin: NSPoint;
     _epsData: NSData;
     _pdfImageRep: NSPDFImageRep;
     
   public
-    class function alloc: NSEPSImageRep; message 'alloc';
-
     class function imageRepWithData(epsData: NSData): id; message 'imageRepWithData:';
     function initWithData(epsData: NSData): id; message 'initWithData:';
     procedure prepareGState; message 'prepareGState';
     function EPSRepresentation: NSData; message 'EPSRepresentation';
     function boundingBox: NSRect; message 'boundingBox';
-  end; external;
+  end;
 
 {$endif}
 {$endif}

packages/cocoaint/src/appkit/NSErrors.inc

@@ -1,5 +1,5 @@
 { Parsed from Appkit.framework NSErrors.h }
-{ Version: 2.1.2 - Wed Dec 8 10:06:06 CET 2010 }
+{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
 
 
 {$ifdef TYPES}

packages/cocoaint/src/appkit/NSEvent.inc

@@ -1,5 +1,5 @@
 { Parsed from Appkit.framework NSEvent.h }
-{ Version: 2.1.2 - Wed Dec 8 10:06:06 CET 2010 }
+{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
 
 
 {$ifdef TYPES}
@@ -227,7 +227,7 @@ type
 {$define NSEVENT_PAS_C}
 
 { NSEvent }
-  NSEvent = objcclass(NSObject, NSCopyingProtocol, NSCodingProtocol)
+  NSEvent = objcclass external (NSObject, NSCopyingProtocol, NSCodingProtocol)
   private
     _type: NSEventType;
     _location: NSPoint;
@@ -317,8 +317,6 @@ type
     {$endif}
     
   public
-    class function alloc: NSEvent; message 'alloc';
-
     function type_: NSEventType; message 'type';
     function modifierFlags: NSUInteger; message 'modifierFlags';
     function timestamp: NSTimeInterval; message 'timestamp';
@@ -386,7 +384,7 @@ type
     function copyWithZone(zone_: NSZonePtr): id;
     procedure encodeWithCoder(aCoder: NSCoder);
     function initWithCoder(aDecoder: NSCoder): id;
-  end; external;
+  end;
 
 {$endif}
 {$endif}

packages/cocoaint/src/appkit/NSFileWrapper.inc

@@ -1,5 +1,5 @@
 { Parsed from Appkit.framework NSFileWrapper.h }
-{ Version: 2.1.2 - Wed Dec 8 10:06:06 CET 2010 }
+{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
 
 
 {$ifdef TYPES}
@@ -59,7 +59,7 @@ type
 {$define NSFILEWRAPPER_PAS_C}
 
 { NSFileWrapper }
-  NSFileWrapper = objcclass(NSObject, NSCodingProtocol)
+  NSFileWrapper = objcclass external (NSObject, NSCodingProtocol)
   private
     _fileAttributes: NSDictionary;
     _preferredFileName: NSString;
@@ -69,8 +69,6 @@ type
     _moreVars: id;
     
   public
-    class function alloc: NSFileWrapper; message 'alloc';
-
     function initWithURL_options_error(url: NSURL; options: NSFileWrapperReadingOptions; outError: NSErrorPointer): id; message 'initWithURL:options:error:';
     function initDirectoryWithFileWrappers(childrenByPreferredName: NSDictionary): id; message 'initDirectoryWithFileWrappers:';
     function initRegularFileWithContents(contents: NSData): id; message 'initRegularFileWithContents:';
@@ -102,10 +100,10 @@ type
     { Adopted Protocols }
     procedure encodeWithCoder(aCoder: NSCoder);
     function initWithCoder(aDecoder: NSCoder): id;
-  end; external;
+  end;
 
 { NSDeprecated_NSFileWrapperCategory }
-  NSDeprecated_NSFileWrapperCategory = objccategory(NSFileWrapper)
+  NSDeprecated_NSFileWrapperCategory = objccategory external name 'NSDeprecated' (NSFileWrapper)
     function initWithPath(path: NSString): id; message 'initWithPath:';
     function initSymbolicLinkWithDestination(path: NSString): id; message 'initSymbolicLinkWithDestination:';
     function needsToBeUpdatedFromPath(path: NSString): Boolean; message 'needsToBeUpdatedFromPath:';
@@ -114,7 +112,7 @@ type
     function addFileWithPath(path: NSString): NSString; message 'addFileWithPath:';
     function addSymbolicLinkWithDestination_preferredFilename(path: NSString; filename_: NSString): NSString; message 'addSymbolicLinkWithDestination:preferredFilename:';
     function symbolicLinkDestination: NSString; message 'symbolicLinkDestination';
-  end; external name 'NSDeprecated';
+  end;
 
 {$endif}
 {$endif}

packages/cocoaint/src/appkit/NSFont.inc

@@ -1,5 +1,5 @@
 { Parsed from Appkit.framework NSFont.h }
-{ Version: 2.1.2 - Wed Dec 8 10:06:06 CET 2010 }
+{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
 
 
 {$ifdef TYPES}
@@ -104,7 +104,7 @@ var
 {$define NSFONT_PAS_C}
 
 { NSFont }
-  NSFont = objcclass(NSObject, NSCopyingProtocol, NSCodingProtocol)
+  NSFont = objcclass external (NSObject, NSCopyingProtocol, NSCodingProtocol)
   private
     _name: NSString;
     _size: CGFloat;
@@ -124,8 +124,6 @@ var
     _private: id;
     
   public
-    class function alloc: NSFont; message 'alloc';
-
     class function fontWithName_size(fontName_: NSString; fontSize: CGFloat): NSFont; message 'fontWithName:size:';
     class function fontWithName_matrix(fontName_: NSString; fontMatrix: CGFloatPtr): NSFont; message 'fontWithName:matrix:';
     class function fontWithDescriptor_size(fontDescriptor_: NSFontDescriptor; fontSize: CGFloat): NSFont; message 'fontWithDescriptor:size:';
@@ -186,10 +184,10 @@ var
     function copyWithZone(zone_: NSZonePtr): id;
     procedure encodeWithCoder(aCoder: NSCoder);
     function initWithCoder(aDecoder: NSCoder): id;
-  end; external;
+  end;
 
 { NSFontDeprecatedCategory }
-  NSFontDeprecatedCategory = objccategory(NSFont)
+  NSFontDeprecatedCategory = objccategory external (NSFont)
     class procedure useFont(fontName_: NSString); message 'useFont:'; deprecated 'in Mac OS X 10.4 and later';
     function widthOfString(string_: NSString): CGFloat; message 'widthOfString:'; deprecated 'in Mac OS X 10.4 and later';
     function isBaseFont: Boolean; message 'isBaseFont'; deprecated 'in Mac OS X 10.4 and later';
@@ -206,7 +204,7 @@ var
     function positionOfGlyph_struckOverRect_metricsExist(aGlyph: NSGlyph; aRect: NSRect; exist: pboolean): NSPoint; message 'positionOfGlyph:struckOverRect:metricsExist:'; deprecated 'in Mac OS X 10.4 and later';
     function positionOfGlyph_forCharacter_struckOverRect(aGlyph: NSGlyph; aChar: unichar; aRect: NSRect): NSPoint; message 'positionOfGlyph:forCharacter:struckOverRect:'; deprecated 'in Mac OS X 10.4 and later';
     function positionOfGlyph_withRelation_toBaseGlyph_totalAdvancement_metricsExist(thisGlyph: NSGlyph; rel: NSGlyphRelation; baseGlyph: NSGlyph; adv: NSSizePointer; exist: pboolean): NSPoint; message 'positionOfGlyph:withRelation:toBaseGlyph:totalAdvancement:metricsExist:'; deprecated 'in Mac OS X 10.4 and later';
-  end; external;
+  end;
 
 {$endif}
 {$endif}

packages/cocoaint/src/appkit/NSFontDescriptor.inc

@@ -1,5 +1,5 @@
 { Parsed from Appkit.framework NSFontDescriptor.h }
-{ Version: 2.1.2 - Wed Dec 8 10:06:06 CET 2010 }
+{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
 
 
 {$ifdef TYPES}
@@ -103,7 +103,7 @@ var
 {$define NSFONTDESCRIPTOR_PAS_C}
 
 { NSFontDescriptor }
-  NSFontDescriptor = objcclass(NSObject, NSCopyingProtocol, NSCodingProtocol)
+  NSFontDescriptor = objcclass external (NSObject, NSCopyingProtocol, NSCodingProtocol)
   private
     _attributes: NSMutableDictionary;
     _reserved1: id;
@@ -113,8 +113,6 @@ var
     _reserved5: id;
     
   public
-    class function alloc: NSFontDescriptor; message 'alloc';
-
     function postscriptName: NSString; message 'postscriptName';
     function pointSize: CGFloat; message 'pointSize';
     function matrix: NSAffineTransform; message 'matrix';
@@ -138,7 +136,7 @@ var
     function copyWithZone(zone_: NSZonePtr): id;
     procedure encodeWithCoder(aCoder: NSCoder);
     function initWithCoder(aDecoder: NSCoder): id;
-  end; external;
+  end;
 
 {$endif}
 {$endif}

packages/cocoaint/src/appkit/NSFontManager.inc

@@ -1,5 +1,5 @@
 { Parsed from Appkit.framework NSFontManager.h }
-{ Version: 2.1.2 - Wed Dec 8 10:06:06 CET 2010 }
+{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
 
 
 {$ifdef TYPES}
@@ -78,7 +78,7 @@ const
 {$define NSFONTMANAGER_PAS_C}
 
 { NSFontManager }
-  NSFontManager = objcclass(NSObject)
+  NSFontManager = objcclass external (NSObject)
   private
     _panel: NSFontPanel;
     _fmReserved1: cuint;
@@ -103,8 +103,6 @@ const
     _fmReserved4: NSUInteger;
     
   public
-    class function alloc: NSFontManager; message 'alloc';
-
     class procedure setFontPanelFactory(factoryId: Pobjc_class); message 'setFontPanelFactory:';
     class procedure setFontManagerFactory(factoryId: Pobjc_class); message 'setFontManagerFactory:';
     class function sharedFontManager: NSFontManager; message 'sharedFontManager';
@@ -148,10 +146,10 @@ const
     function convertFontTraits(traits: NSFontTraitMask): NSFontTraitMask; message 'convertFontTraits:';
     procedure setTarget(aTarget: id); message 'setTarget:';
     function target: id; message 'target';
-  end; external;
+  end;
 
 { NSFontManagerMenuActionMethodsCategory }
-  NSFontManagerMenuActionMethodsCategory = objccategory(NSFontManager)
+  NSFontManagerMenuActionMethodsCategory = objccategory external (NSFontManager)
     function fontNamed_hasTraits(fName: NSString; someTraits: NSFontTraitMask): Boolean; message 'fontNamed:hasTraits:';
     function availableFontNamesWithTraits(someTraits: NSFontTraitMask): NSArray; message 'availableFontNamesWithTraits:';
     procedure addFontTrait(sender: id); message 'addFontTrait:';
@@ -160,17 +158,17 @@ const
     procedure modifyFont(sender: id); message 'modifyFont:';
     procedure orderFrontFontPanel(sender: id); message 'orderFrontFontPanel:';
     procedure orderFrontStylesPanel(sender: id); message 'orderFrontStylesPanel:';
-  end; external;
+  end;
 
 { NSFontManagerDelegateCategory }
-  NSFontManagerDelegateCategory = objccategory(NSObject)
+  NSFontManagerDelegateCategory = objccategory external (NSObject)
     function fontManager_willIncludeFont(sender: id; fontName: NSString): Boolean; message 'fontManager:willIncludeFont:';
-  end; external;
+  end;
 
 { NSFontManagerResponderMethodCategory }
-  NSFontManagerResponderMethodCategory = objccategory(NSObject)
+  NSFontManagerResponderMethodCategory = objccategory external (NSObject)
     procedure changeFont(sender: id); message 'changeFont:';
-  end; external;
+  end;
 
 {$endif}
 {$endif}

packages/cocoaint/src/appkit/NSFontPanel.inc

@@ -1,5 +1,5 @@
 { Parsed from Appkit.framework NSFontPanel.h }
-{ Version: 2.1.2 - Wed Dec 8 10:06:06 CET 2010 }
+{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
 
 
 {$ifdef TYPES}
@@ -66,7 +66,7 @@ const
 {$define NSFONTPANEL_PAS_C}
 
 { NSFontPanel }
-  NSFontPanel = objcclass(NSPanel)
+  NSFontPanel = objcclass external (NSPanel)
   private
     _manager: NSFontManager;
     _collectionNames: NSArray;
@@ -138,8 +138,6 @@ const
     {$endif}
     
   public
-    class function alloc: NSFontPanel; message 'alloc';
-
     class function sharedFontPanel: NSFontPanel; message 'sharedFontPanel';
     class function sharedFontPanelExists: Boolean; message 'sharedFontPanelExists';
     function accessoryView: NSView; message 'accessoryView';
@@ -150,12 +148,12 @@ const
     function isEnabled: Boolean; message 'isEnabled';
     procedure setEnabled(flag: Boolean); message 'setEnabled:';
     procedure reloadDefaultFontFamilies; message 'reloadDefaultFontFamilies';
-  end; external;
+  end;
 
 { NSFontPanelValidationAdditionsCategory }
-  NSFontPanelValidationAdditionsCategory = objccategory(NSObject)
+  NSFontPanelValidationAdditionsCategory = objccategory external (NSObject)
     function validModesForFontPanel(fontPanel: NSFontPanel): NSUInteger; message 'validModesForFontPanel:';
-  end; external;
+  end;
 
 {$endif}
 {$endif}

packages/cocoaint/src/appkit/NSForm.inc

@@ -1,5 +1,5 @@
 { Parsed from Appkit.framework NSForm.h }
-{ Version: 2.1.2 - Wed Dec 8 10:06:06 CET 2010 }
+{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
 
 
 {$ifdef TYPES}

packages/cocoaint/src/appkit/NSFormCell.inc

@@ -1,5 +1,5 @@
 { Parsed from Appkit.framework NSFormCell.h }
-{ Version: 2.1.2 - Wed Dec 8 10:06:06 CET 2010 }
+{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
 
 
 {$ifdef TYPES}
@@ -42,15 +42,13 @@
 {$define NSFORMCELL_PAS_C}
 
 { NSFormCell }
-  NSFormCell = objcclass(NSActionCell)
+  NSFormCell = objcclass external (NSActionCell)
   private
     _titleWidth: CGFloat;
     _titleCell: id;
     _titleEndPoint: CGFloat;
     
   public
-    class function alloc: NSFormCell; message 'alloc';
-
     function initTextCell(aString: NSString): id; message 'initTextCell:';
     function titleWidth(aSize: NSSize): CGFloat; message 'titleWidth:';
     procedure setTitleWidth(width: CGFloat); message 'setTitleWidth:';
@@ -67,18 +65,18 @@
     function placeholderAttributedString: NSAttributedString; message 'placeholderAttributedString';
     function titleBaseWritingDirection: NSWritingDirection; message 'titleBaseWritingDirection';
     procedure setTitleBaseWritingDirection(writingDirection: NSWritingDirection); message 'setTitleBaseWritingDirection:';
-  end; external;
+  end;
 
 { NSKeyboardUI_NSFormCellCategory }
-  NSKeyboardUI_NSFormCellCategory = objccategory(NSFormCell)
+  NSKeyboardUI_NSFormCellCategory = objccategory external name 'NSKeyboardUI' (NSFormCell)
     procedure setTitleWithMnemonic(stringWithAmpersand: NSString); message 'setTitleWithMnemonic:';
-  end; external name 'NSKeyboardUI';
+  end;
 
 { NSFormCellAttributedStringMethodsCategory }
-  NSFormCellAttributedStringMethodsCategory = objccategory(NSFormCell)
+  NSFormCellAttributedStringMethodsCategory = objccategory external (NSFormCell)
     function attributedTitle: NSAttributedString; message 'attributedTitle';
     procedure setAttributedTitle(obj: NSAttributedString); message 'setAttributedTitle:';
-  end; external;
+  end;
 
 {$endif}
 {$endif}

packages/cocoaint/src/appkit/NSGlyphGenerator.inc

@@ -1,5 +1,5 @@
 { Parsed from Appkit.framework NSGlyphGenerator.h }
-{ Version: 2.1.2 - Wed Dec 8 10:06:06 CET 2010 }
+{ Version: 2.1.4 - Sun Jan 2 15:08:20 CET 2011 }
 
 
 {$ifdef TYPES}
@@ -50,14 +50,12 @@ const
 {$define NSGLYPHGENERATOR_PAS_C}
 
 { NSGlyphGenerator }
-  NSGlyphGenerator = objcclass(NSObject)
+  NSGlyphGenerator = objcclass external (NSObject)
     
   public
-    class function alloc: NSGlyphGenerator; message 'alloc';
-
     procedure generateGlyphsForGlyphStorage_desiredNumberOfCharacters_glyphIndex_characterIndex(glyphStorage: id; nChars: NSUInteger; glyphIndex: NSUIntegerPtr; charIndex: NSUIntegerPtr); message 'generateGlyphsForGlyphStorage:desiredNumberOfCharacters:glyphIndex:characterIndex:';
     class function sharedGlyphGenerator: id; message 'sharedGlyphGenerator';
-  end; external;
+  end;
 
 {$endif}
 {$endif}
@@ -66,11 +64,11 @@ const
 {$define NSGLYPHGENERATOR_PAS_P}
   
 { NSGlyphStorage Protocol }
-  NSGlyphStorageProtocol = objcprotocol
+  NSGlyphStorageProtocol = objcprotocol external name 'NSGlyphStorage'
     procedure insertGlyphs_length_forStartingGlyphAtIndex_characterIndex(glyphs: NSGlyphPtr; length: NSUInteger; glyphIndex: NSUInteger; charIndex: NSUInteger); message 'insertGlyphs:length:forStartingGlyphAtIndex:characterIndex:';
     procedure setIntAttribute_value_forGlyphAtIndex(attributeTag: NSInteger; val: NSInteger; glyphIndex: NSUInteger); message 'setIntAttribute:value:forGlyphAtIndex:';
     function attributedString: NSAttributedString; message 'attributedString';
     function layoutOptions: NSUInteger; message 'layoutOptions';
-  end; external name 'NSGlyphStorage';
+  end;
 {$endif}
 {$endif}

packages/cocoaint/src/appkit/NSGlyphInfo.inc

@@ -1,5 +1,5 @@
 { Parsed from Appkit.framework NSGlyphInfo.h }
-{ Version: 2.1.2 - Wed Dec 8 10:06:06 CET 2010 }
+{ Version: 2.1.4 - Sun Jan 2 15:08:20 CET 2011 }
 
 
 {$ifdef TYPES}
@@ -57,13 +57,11 @@ type
 {$define NSGLYPHINFO_PAS_C}
 
 { NSGlyphInfo }
-  NSGlyphInfo = objcclass(NSObject, NSCopyingProtocol, NSCodingProtocol)
+  NSGlyphInfo = objcclass external (NSObject, NSCopyingProtocol, NSCodingProtocol)
   private
     _baseString: NSString;
     
   public
-    class function alloc: NSGlyphInfo; message 'alloc';
-
     class function glyphInfoWithGlyphName_forFont_baseString(glyphName_: NSString; font: NSFont; theString: NSString): NSGlyphInfo; message 'glyphInfoWithGlyphName:forFont:baseString:';
     class function glyphInfoWithGlyph_forFont_baseString(glyph: NSGlyph; font: NSFont; theString: NSString): NSGlyphInfo; message 'glyphInfoWithGlyph:forFont:baseString:';
     class function glyphInfoWithCharacterIdentifier_collection_baseString(cid: NSUInteger; characterCollection_: NSCharacterCollection; theString: NSString): NSGlyphInfo; message 'glyphInfoWithCharacterIdentifier:collection:baseString:';
@@ -75,7 +73,7 @@ type
     function copyWithZone(zone_: NSZonePtr): id;
     procedure encodeWithCoder(aCoder: NSCoder);
     function initWithCoder(aDecoder: NSCoder): id;
-  end; external;
+  end;
 
 {$endif}
 {$endif}

packages/cocoaint/src/appkit/NSGradient.inc

@@ -1,5 +1,5 @@
 { Parsed from Appkit.framework NSGradient.h }
-{ Version: 2.1.2 - Wed Dec 8 10:06:06 CET 2010 }
+{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
 
 
 {$ifdef TYPES}
@@ -53,7 +53,7 @@ const
 {$define NSGRADIENT_PAS_C}
 
 { NSGradient }
-  NSGradient = objcclass(NSObject, NSCopyingProtocol, NSCodingProtocol)
+  NSGradient = objcclass external (NSObject, NSCopyingProtocol, NSCodingProtocol)
   private
     _colorArray: NSArray;
     _colorSpace: NSColorSpace;
@@ -64,8 +64,6 @@ const
     _reserved3: Pointer;
     
   public
-    class function alloc: NSGradient; message 'alloc';
-
     function initWithStartingColor_endingColor(startingColor: NSColor; endingColor: NSColor): id; message 'initWithStartingColor:endingColor:';
     function initWithColors(colorArray: NSArray): id; message 'initWithColors:';
     function initWithColorsAndLocations(firstKey: id): id; varargs; message 'initWithColorsAndLocations:';
@@ -85,7 +83,7 @@ const
     function copyWithZone(zone_: NSZonePtr): id;
     procedure encodeWithCoder(aCoder: NSCoder);
     function initWithCoder(aDecoder: NSCoder): id;
-  end; external;
+  end;
 
 {$endif}
 {$endif}

packages/cocoaint/src/appkit/NSGraphics.inc

@@ -1,5 +1,5 @@
 { Parsed from Appkit.framework NSGraphics.h }
-{ Version: 2.1.2 - Wed Dec 8 10:06:06 CET 2010 }
+{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
 
 
 {$ifdef TYPES}

packages/cocoaint/src/appkit/NSGraphicsContext.inc

@@ -1,5 +1,5 @@
 { Parsed from Appkit.framework NSGraphicsContext.h }
-{ Version: 2.1.2 - Wed Dec 8 10:06:06 CET 2010 }
+{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
 
 
 {$ifdef TYPES}
@@ -63,11 +63,9 @@ var
 {$define NSGRAPHICSCONTEXT_PAS_C}
 
 { NSGraphicsContext }
-  NSGraphicsContext = objcclass(NSObject)
+  NSGraphicsContext = objcclass external (NSObject)
     
   public
-    class function alloc: NSGraphicsContext; message 'alloc';
-
     class function graphicsContextWithAttributes(attributes_: NSDictionary): NSGraphicsContext; message 'graphicsContextWithAttributes:';
     class function graphicsContextWithWindow(window: NSWindow): NSGraphicsContext; message 'graphicsContextWithWindow:';
     class function graphicsContextWithBitmapImageRep(bitmapRep: NSBitmapImageRep): NSGraphicsContext; message 'graphicsContextWithBitmapImageRep:';
@@ -83,18 +81,18 @@ var
     procedure flushGraphics; message 'flushGraphics';
     function graphicsPort: Pointer; message 'graphicsPort';
     function isFlipped: Boolean; message 'isFlipped';
-  end; external;
+  end;
 
 { NSQuartzCoreAdditionsCategory }
-  NSQuartzCoreAdditionsCategory = objccategory(NSGraphicsContext)
+  NSQuartzCoreAdditionsCategory = objccategory external (NSGraphicsContext)
     function CIContext: CIContext; message 'CIContext';
-  end; external;
+  end;
 
 { NSGraphicsContextDeprecatedCategory }
-  NSGraphicsContextDeprecatedCategory = objccategory(NSGraphicsContext)
+  NSGraphicsContextDeprecatedCategory = objccategory external (NSGraphicsContext)
     function focusStack: id; message 'focusStack';
     procedure setFocusStack(stack: id); message 'setFocusStack:';
-  end; external;
+  end;
 
 {$endif}
 {$endif}

packages/cocoaint/src/appkit/NSHelpManager.inc

@@ -1,5 +1,5 @@
 { Parsed from Appkit.framework NSHelpManager.h }
-{ Version: 2.1.2 - Wed Dec 8 10:06:06 CET 2010 }
+{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
 
 
 {$ifdef TYPES}
@@ -47,7 +47,7 @@ var
 {$define NSHELPMANAGER_PAS_C}
 
 { NSHelpManager }
-  NSHelpManager = objcclass(NSObject)
+  NSHelpManager = objcclass external (NSObject)
   private
     _helpMapTable: NSMapTable;
     _keyMapTable: NSMapTable;
@@ -58,8 +58,6 @@ var
     _helpBundle: NSBundle;
     
   public
-    class function alloc: NSHelpManager; message 'alloc';
-
     class function sharedHelpManager: NSHelpManager; message 'sharedHelpManager';
     class procedure setContextHelpModeActive(active: Boolean); message 'setContextHelpModeActive:';
     class function isContextHelpModeActive: Boolean; message 'isContextHelpModeActive';
@@ -70,18 +68,18 @@ var
     procedure openHelpAnchor_inBook(anchor: NSString; book: NSString); message 'openHelpAnchor:inBook:';
     procedure findString_inBook(query: NSString; book: NSString); message 'findString:inBook:';
     function registerBooksInBundle(bundle: NSBundle): Boolean; message 'registerBooksInBundle:';
-  end; external;
+  end;
 
 { NSBundleHelpExtensionCategory }
-  NSBundleHelpExtensionCategory = objccategory(NSBundle)
+  NSBundleHelpExtensionCategory = objccategory external (NSBundle)
     function contextHelpForKey(key: NSString): NSAttributedString; message 'contextHelpForKey:';
-  end; external;
+  end;
 
 { NSApplicationHelpExtensionCategory }
-  NSApplicationHelpExtensionCategory = objccategory(NSApplication)
+  NSApplicationHelpExtensionCategory = objccategory external (NSApplication)
     procedure activateContextHelpMode(sender: id); message 'activateContextHelpMode:';
     procedure showHelp(sender: id); message 'showHelp:';
-  end; external;
+  end;
 
 {$endif}
 {$endif}

packages/cocoaint/src/appkit/NSImage.inc

@@ -1,5 +1,5 @@
 { Parsed from Appkit.framework NSImage.h }
-{ Version: 2.1.2 - Wed Dec 8 10:06:06 CET 2010 }
+{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
 
 
 {$ifdef TYPES}
@@ -129,7 +129,7 @@ var
 {$define NSIMAGE_PAS_C}
 
 { NSImage }
-  NSImage = objcclass(NSObject)
+  NSImage = objcclass external (NSObject)
   private
     _name: NSString;
     _size: NSSize;
@@ -164,8 +164,6 @@ var
     _imageAuxiliary: _NSImageAuxiliary;
     
   public
-    class function alloc: NSImage; message 'alloc';
-
     class function imageNamed(name_: NSString): id; message 'imageNamed:';
     function initWithSize(aSize: NSSize): id; message 'initWithSize:';
     function initWithData(data: NSData): id; message 'initWithData:';
@@ -226,16 +224,16 @@ var
     function CGImageForProposedRect_context_hints(proposedDestRect: NSRectPtr; referenceContext: NSGraphicsContext; hints: NSDictionary): CGImageRef; message 'CGImageForProposedRect:context:hints:';
     function bestRepresentationForRect_context_hints(rect: NSRect; referenceContext: NSGraphicsContext; hints: NSDictionary): NSImageRep; message 'bestRepresentationForRect:context:hints:';
     function hitTestRect_withImageDestinationRect_context_hints_flipped(testRectDestSpace: NSRect; imageRectDestSpace: NSRect; context: NSGraphicsContext; hints: NSDictionary; flipped: Boolean): Boolean; message 'hitTestRect:withImageDestinationRect:context:hints:flipped:';
-  end; external;
+  end;
 
 { NSBundleImageExtensionCategory }
-  NSBundleImageExtensionCategory = objccategory(NSBundle)
+  NSBundleImageExtensionCategory = objccategory external (NSBundle)
     function pathForImageResource(name: NSString): NSString; message 'pathForImageResource:';
     function URLForImageResource(name: NSString): NSURL; message 'URLForImageResource:';
-  end; external;
+  end;
 
 { NSDeprecated_NSImageCategory }
-  NSDeprecated_NSImageCategory = objccategory(NSImage)
+  NSDeprecated_NSImageCategory = objccategory external name 'NSDeprecated' (NSImage)
     procedure setFlipped(flag: Boolean); message 'setFlipped:';
     function isFlipped: Boolean; message 'isFlipped';
     procedure dissolveToPoint_fraction(point: NSPoint; aFloat: CGFloat); message 'dissolveToPoint:fraction:';
@@ -253,7 +251,7 @@ var
     function isCachedSeparately: Boolean; message 'isCachedSeparately';
     procedure setCacheDepthMatchesImageDepth(flag: Boolean); message 'setCacheDepthMatchesImageDepth:';
     function cacheDepthMatchesImageDepth: Boolean; message 'cacheDepthMatchesImageDepth';
-  end; external name 'NSDeprecated';
+  end;
 
 {$endif}
 {$endif}
@@ -262,12 +260,12 @@ var
 {$define NSIMAGE_PAS_P}
   
 { NSImageDelegate Protocol }
-  NSImageDelegateProtocol = objcprotocol
+  NSImageDelegateProtocol = objcprotocol external name 'NSImageDelegate'
     function imageDidNotDraw_inRect(sender: id; aRect: NSRect): NSImage; message 'imageDidNotDraw:inRect:';
     procedure image_willLoadRepresentation(image: NSImage; rep: NSImageRep); message 'image:willLoadRepresentation:';
     procedure image_didLoadRepresentationHeader(image: NSImage; rep: NSImageRep); message 'image:didLoadRepresentationHeader:';
     procedure image_didLoadPartOfRepresentation_withValidRows(image: NSImage; rep: NSImageRep; rows: NSInteger); message 'image:didLoadPartOfRepresentation:withValidRows:';
     procedure image_didLoadRepresentation_withStatus(image: NSImage; rep: NSImageRep; status: NSImageLoadStatus); message 'image:didLoadRepresentation:withStatus:';
-  end; external name 'NSImageDelegate';
+  end;
 {$endif}
 {$endif}

packages/cocoaint/src/appkit/NSImageCell.inc

@@ -1,5 +1,5 @@
 { Parsed from Appkit.framework NSImageCell.h }
-{ Version: 2.1.2 - Wed Dec 8 10:06:06 CET 2010 }
+{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
 
 
 {$ifdef TYPES}
@@ -69,7 +69,7 @@ type
 {$define NSIMAGECELL_PAS_C}
 
 { NSImageCell }
-  NSImageCell = objcclass(NSCell, NSCopyingProtocol, NSCodingProtocol)
+  NSImageCell = objcclass external (NSCell, NSCopyingProtocol, NSCodingProtocol)
   private
     _controlView: id;
     __icFlags: bitpacked record
@@ -87,8 +87,6 @@ type
     _scaledImage: NSImage;
     
   public
-    class function alloc: NSImageCell; message 'alloc';
-
     function imageAlignment: NSImageAlignment; message 'imageAlignment';
     procedure setImageAlignment(newAlign: NSImageAlignment); message 'setImageAlignment:';
     function imageScaling: NSImageScaling; message 'imageScaling';
@@ -100,7 +98,7 @@ type
     function copyWithZone(zone_: NSZonePtr): id;
     procedure encodeWithCoder(aCoder: NSCoder);
     function initWithCoder(aDecoder: NSCoder): id;
-  end; external;
+  end;
 
 {$endif}
 {$endif}

packages/cocoaint/src/appkit/NSImageRep.inc

@@ -1,5 +1,5 @@
 { Parsed from Appkit.framework NSImageRep.h }
-{ Version: 2.1.2 - Wed Dec 8 10:06:06 CET 2010 }
+{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
 
 
 {$ifdef TYPES}
@@ -51,7 +51,7 @@ var
 {$define NSIMAGEREP_PAS_C}
 
 { NSImageRep }
-  NSImageRep = objcclass(NSObject, NSCopyingProtocol, NSCodingProtocol)
+  NSImageRep = objcclass external (NSObject, NSCopyingProtocol, NSCodingProtocol)
   private
     __repFlags: bitpacked record
       case byte of
@@ -74,8 +74,6 @@ var
     _pixelsHigh: cint;
     
   public
-    class function alloc: NSImageRep; message 'alloc';
-
     function draw: Boolean; message 'draw';
     function drawAtPoint(point: NSPoint): Boolean; message 'drawAtPoint:';
     function drawInRect(rect: NSRect): Boolean; message 'drawInRect:';
@@ -121,7 +119,7 @@ var
     function copyWithZone(zone_: NSZonePtr): id;
     procedure encodeWithCoder(aCoder: NSCoder);
     function initWithCoder(aDecoder: NSCoder): id;
-  end; external;
+  end;
 
 {$endif}
 {$endif}

packages/cocoaint/src/appkit/NSImageView.inc

@@ -1,5 +1,5 @@
 { Parsed from Appkit.framework NSImageView.h }
-{ Version: 2.1.2 - Wed Dec 8 10:06:06 CET 2010 }
+{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
 
 
 {$ifdef TYPES}
@@ -42,7 +42,7 @@
 {$define NSIMAGEVIEW_PAS_C}
 
 { NSImageView }
-  NSImageView = objcclass(NSControl)
+  NSImageView = objcclass external (NSControl)
   private
     __ivFlags: bitpacked record
       case byte of
@@ -61,8 +61,6 @@
     _action: SEL;
     
   public
-    class function alloc: NSImageView; message 'alloc';
-
     function image: NSImage; message 'image';
     procedure setImage(newImage: NSImage); message 'setImage:';
     function imageAlignment: NSImageAlignment; message 'imageAlignment';
@@ -77,7 +75,7 @@
     function animates: Boolean; message 'animates';
     function allowsCutCopyPaste: Boolean; message 'allowsCutCopyPaste';
     procedure setAllowsCutCopyPaste(allow: Boolean); message 'setAllowsCutCopyPaste:';
-  end; external;
+  end;
 
 {$endif}
 {$endif}

packages/cocoaint/src/appkit/NSInputManager.inc

@@ -1,5 +1,5 @@
 { Parsed from Appkit.framework NSInputManager.h }
-{ Version: 2.1.2 - Wed Dec 8 10:06:06 CET 2010 }
+{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
 
 
 {$ifdef TYPES}
@@ -43,7 +43,7 @@
 {$define NSINPUTMANAGER_PAS_C}
 
 { NSInputManager }
-  NSInputManager = objcclass(NSObject, NSTextInputProtocol)
+  NSInputManager = objcclass external (NSObject, NSTextInputProtocol)
   private
     _currentClient: id;
     _server: id;
@@ -62,8 +62,6 @@
     _reservedInputManager2: cint;
     
   public
-    class function alloc: NSInputManager; message 'alloc';
-
     class function currentInputManager: NSInputManager; message 'currentInputManager';
     class procedure cycleToNextInputLanguage(sender: id); message 'cycleToNextInputLanguage:';
     class procedure cycleToNextInputServerInLanguage(sender: id); message 'cycleToNextInputServerInLanguage:';
@@ -92,7 +90,7 @@
     function firstRectForCharacterRange(theRange: NSRange): NSRect;
     function characterIndexForPoint(thePoint: NSPoint): NSUInteger;
     function validAttributesForMarkedText: NSArray;
-  end; external;
+  end;
 
 {$endif}
 {$endif}
@@ -101,7 +99,7 @@
 {$define NSINPUTMANAGER_PAS_P}
   
 { NSTextInput Protocol }
-  NSTextInputProtocol = objcprotocol
+  NSTextInputProtocol = objcprotocol external name 'NSTextInput'
     procedure insertText(aString: id); message 'insertText:';
     procedure doCommandBySelector(aSelector: SEL); message 'doCommandBySelector:';
     procedure setMarkedText_selectedRange(aString: id; selRange: NSRange); message 'setMarkedText:selectedRange:';
@@ -114,6 +112,6 @@
     function firstRectForCharacterRange(theRange: NSRange): NSRect; message 'firstRectForCharacterRange:';
     function characterIndexForPoint(thePoint: NSPoint): NSUInteger; message 'characterIndexForPoint:';
     function validAttributesForMarkedText: NSArray; message 'validAttributesForMarkedText';
-  end; external name 'NSTextInput';
+  end;
 {$endif}
 {$endif}

packages/cocoaint/src/appkit/NSInputServer.inc

@@ -1,5 +1,5 @@
 { Parsed from Appkit.framework NSInputServer.h }
-{ Version: 2.1.2 - Wed Dec 8 10:06:06 CET 2010 }
+{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
 
 
 {$ifdef TYPES}
@@ -44,13 +44,12 @@
 {$define NSINPUTSERVER_PAS_C}
 
 { NSInputServer }
-  NSInputServer = objcclass(NSObject, NSInputServiceProviderProtocol, NSInputServerMouseTrackerProtocol)
+  NSInputServer = objcclass external (NSObject, NSInputServiceProviderProtocol, NSInputServerMouseTrackerProtocol)
   private
     _name: NSString;
     _delegate: id;
     
   public
-    class function alloc: NSInputServer; message 'alloc';
 
     { Adopted Protocols }
     procedure insertText_client(aString: id; sender: id);
@@ -71,7 +70,7 @@
     function mouseDownOnCharacterIndex_atCoordinate_withModifier_client(theIndex: NSUInteger; thePoint: NSPoint; theFlags: NSUInteger; sender: id): Boolean;
     function mouseDraggedOnCharacterIndex_atCoordinate_withModifier_client(theIndex: NSUInteger; thePoint: NSPoint; theFlags: NSUInteger; sender: id): Boolean;
     procedure mouseUpOnCharacterIndex_atCoordinate_withModifier_client(theIndex: NSUInteger; thePoint: NSPoint; theFlags: NSUInteger; sender: id);
-  end; external;
+  end;
 
 {$endif}
 {$endif}
@@ -80,7 +79,7 @@
 {$define NSINPUTSERVER_PAS_P}
   
 { NSInputServiceProvider Protocol }
-  NSInputServiceProviderProtocol = objcprotocol
+  NSInputServiceProviderProtocol = objcprotocol external name 'NSInputServiceProvider'
     procedure insertText_client(aString: id; sender: id); message 'insertText:client:'; deprecated 'in Mac OS X 10.6 and later';
     procedure doCommandBySelector_client(aSelector: SEL; sender: id); message 'doCommandBySelector:client:'; deprecated 'in Mac OS X 10.6 and later';
     procedure markedTextAbandoned(sender: id); message 'markedTextAbandoned:'; deprecated 'in Mac OS X 10.6 and later';
@@ -96,13 +95,13 @@
     procedure inputClientDisabled(sender: id); message 'inputClientDisabled:'; deprecated 'in Mac OS X 10.6 and later';
     procedure activeConversationWillChange_fromOldConversation(sender: id; oldConversation: NSInteger); message 'activeConversationWillChange:fromOldConversation:'; deprecated 'in Mac OS X 10.6 and later';
     procedure activeConversationChanged_toNewConversation(sender: id; newConversation: NSInteger); message 'activeConversationChanged:toNewConversation:'; deprecated 'in Mac OS X 10.6 and later';
-  end; external name 'NSInputServiceProvider';
+  end;
   
 { NSInputServerMouseTracker Protocol }
-  NSInputServerMouseTrackerProtocol = objcprotocol
+  NSInputServerMouseTrackerProtocol = objcprotocol external name 'NSInputServerMouseTracker'
     function mouseDownOnCharacterIndex_atCoordinate_withModifier_client(theIndex: NSUInteger; thePoint: NSPoint; theFlags: NSUInteger; sender: id): Boolean; message 'mouseDownOnCharacterIndex:atCoordinate:withModifier:client:'; deprecated 'in Mac OS X 10.6 and later';
     function mouseDraggedOnCharacterIndex_atCoordinate_withModifier_client(theIndex: NSUInteger; thePoint: NSPoint; theFlags: NSUInteger; sender: id): Boolean; message 'mouseDraggedOnCharacterIndex:atCoordinate:withModifier:client:'; deprecated 'in Mac OS X 10.6 and later';
     procedure mouseUpOnCharacterIndex_atCoordinate_withModifier_client(theIndex: NSUInteger; thePoint: NSPoint; theFlags: NSUInteger; sender: id); message 'mouseUpOnCharacterIndex:atCoordinate:withModifier:client:'; deprecated 'in Mac OS X 10.6 and later';
-  end; external name 'NSInputServerMouseTracker';
+  end;
 {$endif}
 {$endif}

packages/cocoaint/src/appkit/NSInterfaceStyle.inc

@@ -1,5 +1,5 @@
 { Parsed from Appkit.framework NSInterfaceStyle.h }
-{ Version: 2.1.2 - Wed Dec 8 10:06:06 CET 2010 }
+{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
 
 
 {$ifdef TYPES}
@@ -59,10 +59,10 @@ var
 {$define NSINTERFACESTYLE_PAS_C}
 
 { NSInterfaceStyleCategory }
-  NSInterfaceStyleCategory = objccategory(NSResponder)
+  NSInterfaceStyleCategory = objccategory external (NSResponder)
     function interfaceStyle: NSInterfaceStyle; message 'interfaceStyle';
     procedure setInterfaceStyle(interfaceStyle: NSInterfaceStyle); message 'setInterfaceStyle:';
-  end; external;
+  end;
 
 {$endif}
 {$endif}

packages/cocoaint/src/appkit/NSKeyValueBinding.inc

@@ -1,5 +1,5 @@
 { Parsed from Appkit.framework NSKeyValueBinding.h }
-{ Version: 2.1.2 - Wed Dec 8 10:06:06 CET 2010 }
+{ Version: 2.1.4 - Sun Jan 2 15:08:20 CET 2011 }
 
 
 {$ifdef TYPES}
@@ -158,7 +158,7 @@ var
 {$define NSKEYVALUEBINDING_PAS_C}
 
 { NSKeyValueBindingCreationCategory }
-  NSKeyValueBindingCreationCategory = objccategory(NSObject)
+  NSKeyValueBindingCreationCategory = objccategory external (NSObject)
     class procedure exposeBinding(binding: NSString); message 'exposeBinding:';
     function exposedBindings: NSArray; message 'exposedBindings';
     function valueClassForBinding(binding: NSString): Pobjc_class; message 'valueClassForBinding:';
@@ -166,26 +166,26 @@ var
     procedure unbind(binding: NSString); message 'unbind:';
     function infoForBinding(binding: NSString): NSDictionary; message 'infoForBinding:';
     function optionDescriptionsForBinding(aBinding: NSString): NSArray; message 'optionDescriptionsForBinding:';
-  end; external;
+  end;
 
 { NSPlaceholdersCategory }
-  NSPlaceholdersCategory = objccategory(NSObject)
+  NSPlaceholdersCategory = objccategory external (NSObject)
     class procedure setDefaultPlaceholder_forMarker_withBinding(placeholder: id; marker: id; binding: NSString); message 'setDefaultPlaceholder:forMarker:withBinding:';
     class function defaultPlaceholderForMarker_withBinding(marker: id; binding: NSString): id; message 'defaultPlaceholderForMarker:withBinding:';
-  end; external;
+  end;
 
 { NSEditorRegistrationCategory }
-  NSEditorRegistrationCategory = objccategory(NSObject)
+  NSEditorRegistrationCategory = objccategory external (NSObject)
     procedure objectDidBeginEditing(editor: id); message 'objectDidBeginEditing:';
     procedure objectDidEndEditing(editor: id); message 'objectDidEndEditing:';
-  end; external;
+  end;
 
 { NSEditorCategory }
-  NSEditorCategory = objccategory(NSObject)
+  NSEditorCategory = objccategory external (NSObject)
     procedure discardEditing; message 'discardEditing';
     function commitEditing: Boolean; message 'commitEditing';
     procedure commitEditingWithDelegate_didCommitSelector_contextInfo(delegate: id; didCommitSelector: SEL; contextInfo: Pointer); message 'commitEditingWithDelegate:didCommitSelector:contextInfo:';
-  end; external;
+  end;
 
 {$endif}
 {$endif}

packages/cocoaint/src/appkit/NSLayoutManager.inc

@@ -1,5 +1,5 @@
 { Parsed from Appkit.framework NSLayoutManager.h }
-{ Version: 2.1.2 - Wed Dec 8 10:06:06 CET 2010 }
+{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
 
 
 {$ifdef TYPES}
@@ -73,7 +73,7 @@ type
 {$define NSLAYOUTMANAGER_PAS_C}
 
 { NSLayoutManager }
-  NSLayoutManager = objcclass(NSObject, NSCodingProtocol)
+  NSLayoutManager = objcclass external (NSObject, NSCodingProtocol)
   private
     _textStorage: NSTextStorage;
     _glyphGenerator: NSGlyphGenerator;
@@ -155,8 +155,6 @@ type
     _extraData: id;
     
   public
-    class function alloc: NSLayoutManager; message 'alloc';
-
     function init: id; message 'init';
     function textStorage: NSTextStorage; message 'textStorage';
     procedure setTextStorage(textStorage_: NSTextStorage); message 'setTextStorage:';
@@ -283,10 +281,10 @@ type
     { Adopted Protocols }
     procedure encodeWithCoder(aCoder: NSCoder);
     function initWithCoder(aDecoder: NSCoder): id;
-  end; external;
+  end;
 
 { NSTextViewSupportCategory }
-  NSTextViewSupportCategory = objccategory(NSLayoutManager)
+  NSTextViewSupportCategory = objccategory external (NSLayoutManager)
     function rulerMarkersForTextView_paragraphStyle_ruler(view: NSTextView; style: NSParagraphStyle; ruler: NSRulerView): NSArray; message 'rulerMarkersForTextView:paragraphStyle:ruler:';
     function rulerAccessoryViewForTextView_paragraphStyle_ruler_enabled(view: NSTextView; style: NSParagraphStyle; ruler: NSRulerView; isEnabled: Boolean): NSView; message 'rulerAccessoryViewForTextView:paragraphStyle:ruler:enabled:';
     function layoutManagerOwnsFirstResponderInWindow(window: NSWindow): Boolean; message 'layoutManagerOwnsFirstResponderInWindow:';
@@ -301,7 +299,7 @@ type
     procedure underlineGlyphRange_underlineType_lineFragmentRect_lineFragmentGlyphRange_containerOrigin(glyphRange: NSRange; underlineVal: NSInteger; lineRect: NSRect; lineGlyphRange: NSRange; containerOrigin: NSPoint); message 'underlineGlyphRange:underlineType:lineFragmentRect:lineFragmentGlyphRange:containerOrigin:';
     procedure drawStrikethroughForGlyphRange_strikethroughType_baselineOffset_lineFragmentRect_lineFragmentGlyphRange_containerOrigin(glyphRange: NSRange; strikethroughVal: NSInteger; baselineOffset: CGFloat; lineRect: NSRect; lineGlyphRange: NSRange; containerOrigin: NSPoint); message 'drawStrikethroughForGlyphRange:strikethroughType:baselineOffset:lineFragmentRect:lineFragmentGlyphRange:containerOrigin:';
     procedure strikethroughGlyphRange_strikethroughType_lineFragmentRect_lineFragmentGlyphRange_containerOrigin(glyphRange: NSRange; strikethroughVal: NSInteger; lineRect: NSRect; lineGlyphRange: NSRange; containerOrigin: NSPoint); message 'strikethroughGlyphRange:strikethroughType:lineFragmentRect:lineFragmentGlyphRange:containerOrigin:';
-  end; external;
+  end;
 
 {$endif}
 {$endif}
@@ -310,10 +308,10 @@ type
 {$define NSLAYOUTMANAGER_PAS_P}
   
 { NSLayoutManagerDelegate Protocol }
-  NSLayoutManagerDelegateProtocol = objcprotocol
+  NSLayoutManagerDelegateProtocol = objcprotocol external name 'NSLayoutManagerDelegate'
     procedure layoutManagerDidInvalidateLayout(sender: NSLayoutManager); message 'layoutManagerDidInvalidateLayout:';
     procedure layoutManager_didCompleteLayoutForTextContainer_atEnd(layoutManager: NSLayoutManager; textContainer: NSTextContainer; layoutFinishedFlag: Boolean); message 'layoutManager:didCompleteLayoutForTextContainer:atEnd:';
     function layoutManager_shouldUseTemporaryAttributes_forDrawingToScreen_atCharacterIndex_effectiveRange(layoutManager: NSLayoutManager; attrs: NSDictionary; toScreen: Boolean; charIndex: NSUInteger; effectiveCharRange: NSRangePointer): NSDictionary; message 'layoutManager:shouldUseTemporaryAttributes:forDrawingToScreen:atCharacterIndex:effectiveRange:';
-  end; external name 'NSLayoutManagerDelegate';
+  end;
 {$endif}
 {$endif}

packages/cocoaint/src/appkit/NSLevelIndicator.inc

@@ -1,5 +1,5 @@
 { Parsed from Appkit.framework NSLevelIndicator.h }
-{ Version: 2.1.2 - Wed Dec 8 10:06:06 CET 2010 }
+{ Version: 2.1.4 - Sun Jan 2 15:08:20 CET 2011 }
 
 
 {$ifdef TYPES}
@@ -42,11 +42,9 @@
 {$define NSLEVELINDICATOR_PAS_C}
 
 { NSLevelIndicator }
-  NSLevelIndicator = objcclass(NSControl)
+  NSLevelIndicator = objcclass external (NSControl)
     
   public
-    class function alloc: NSLevelIndicator; message 'alloc';
-
     function minValue: double; message 'minValue';
     procedure setMinValue(minValue_: double); message 'setMinValue:';
     function maxValue: double; message 'maxValue';
@@ -63,7 +61,7 @@
     procedure setNumberOfMajorTickMarks(count: NSInteger); message 'setNumberOfMajorTickMarks:';
     function tickMarkValueAtIndex(index: NSInteger): double; message 'tickMarkValueAtIndex:';
     function rectOfTickMarkAtIndex(index: NSInteger): NSRect; message 'rectOfTickMarkAtIndex:';
-  end; external;
+  end;
 
 {$endif}
 {$endif}

packages/cocoaint/src/appkit/NSLevelIndicatorCell.inc

@@ -1,5 +1,5 @@
 { Parsed from Appkit.framework NSLevelIndicatorCell.h }
-{ Version: 2.1.2 - Wed Dec 8 10:06:06 CET 2010 }
+{ Version: 2.1.4 - Sun Jan 2 15:08:20 CET 2011 }
 
 
 {$ifdef TYPES}
@@ -55,7 +55,7 @@ type
 {$define NSLEVELINDICATORCELL_PAS_C}
 
 { NSLevelIndicatorCell }
-  NSLevelIndicatorCell = objcclass(NSActionCell)
+  NSLevelIndicatorCell = objcclass external (NSActionCell)
   private
     _value: double;
     _minValue: double;
@@ -81,8 +81,6 @@ type
     _reserved4: cint;
     
   public
-    class function alloc: NSLevelIndicatorCell; message 'alloc';
-
     function initWithLevelIndicatorStyle(levelIndicatorStyle_: NSLevelIndicatorStyle): id; message 'initWithLevelIndicatorStyle:';
     function levelIndicatorStyle: NSLevelIndicatorStyle; message 'levelIndicatorStyle';
     procedure setLevelIndicatorStyle(levelIndicatorStyle_: NSLevelIndicatorStyle); message 'setLevelIndicatorStyle:';
@@ -103,7 +101,7 @@ type
     function rectOfTickMarkAtIndex(index: NSInteger): NSRect; message 'rectOfTickMarkAtIndex:';
     function tickMarkValueAtIndex(index: NSInteger): double; message 'tickMarkValueAtIndex:';
     procedure setImage(image_: NSImage); message 'setImage:';
-  end; external;
+  end;
 
 {$endif}
 {$endif}

packages/cocoaint/src/appkit/NSMatrix.inc

@@ -1,5 +1,5 @@
 { Parsed from Appkit.framework NSMatrix.h }
-{ Version: 2.1.2 - Wed Dec 8 10:06:06 CET 2010 }
+{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
 
 
 {$ifdef TYPES}
@@ -130,7 +130,7 @@ __MFlagsPtr = ^__MFlags;
 {$define NSMATRIX_PAS_C}
 
 { NSMatrix }
-  NSMatrix = objcclass(NSControl, NSUserInterfaceValidationsProtocol)
+  NSMatrix = objcclass external (NSControl, NSUserInterfaceValidationsProtocol)
   private
     _target: id;
     _action: SEL;
@@ -153,8 +153,6 @@ __MFlagsPtr = ^__MFlags;
     _mFlags: _MFlags;
     
   public
-    class function alloc: NSMatrix; message 'alloc';
-
     function initWithFrame(frameRect: NSRect): id; message 'initWithFrame:';
     function initWithFrame_mode_prototype_numberOfRows_numberOfColumns(frameRect: NSRect; aMode: NSMatrixMode; aCell: NSCell; rowsHigh: NSInteger; colsWide: NSInteger): id; message 'initWithFrame:mode:prototype:numberOfRows:numberOfColumns:';
     function initWithFrame_mode_cellClass_numberOfRows_numberOfColumns(frameRect: NSRect; aMode: NSMatrixMode; factoryId: Pobjc_class; rowsHigh: NSInteger; colsWide: NSInteger): id; message 'initWithFrame:mode:cellClass:numberOfRows:numberOfColumns:';
@@ -249,15 +247,15 @@ __MFlagsPtr = ^__MFlags;
 
     { Adopted Protocols }
     function validateUserInterfaceItem(anItem: id): Boolean;
-  end; external;
+  end;
 
 { NSKeyboardUI_NSMatrixCategory }
-  NSKeyboardUI_NSMatrixCategory = objccategory(NSMatrix)
+  NSKeyboardUI_NSMatrixCategory = objccategory external name 'NSKeyboardUI' (NSMatrix)
     procedure setTabKeyTraversesCells(flag: Boolean); message 'setTabKeyTraversesCells:';
     function tabKeyTraversesCells: Boolean; message 'tabKeyTraversesCells';
     procedure setKeyCell(keyCell_: NSCell); message 'setKeyCell:';
     function keyCell: id; message 'keyCell';
-  end; external name 'NSKeyboardUI';
+  end;
 
 {$endif}
 {$endif}
@@ -266,7 +264,7 @@ __MFlagsPtr = ^__MFlags;
 {$define NSMATRIX_PAS_P}
   
 { NSMatrixDelegate Protocol }
-  NSMatrixDelegateProtocol = objcprotocol
-  end; external name 'NSMatrixDelegate';
+  NSMatrixDelegateProtocol = objcprotocol external name 'NSMatrixDelegate'
+  end;
 {$endif}
 {$endif}

packages/cocoaint/src/appkit/NSMenu.inc

@@ -1,5 +1,5 @@
 { Parsed from Appkit.framework NSMenu.h }
-{ Version: 2.1.2 - Wed Dec 8 10:06:06 CET 2010 }
+{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
 
 
 {$ifdef TYPES}
@@ -68,7 +68,7 @@ var
 {$define NSMENU_PAS_C}
 
 { NSMenu }
-  NSMenu = objcclass(NSObject, NSCopyingProtocol, NSCodingProtocol)
+  NSMenu = objcclass external (NSObject, NSCopyingProtocol, NSCodingProtocol)
   private
     _supermenu: NSMenu;
     _title: NSString;
@@ -99,8 +99,6 @@ var
     _name: NSString;
     
   public
-    class function alloc: NSMenu; message 'alloc';
-
     function initWithTitle(aTitle: NSString): id; message 'initWithTitle:';
     procedure setTitle(aString: NSString); message 'setTitle:';
     function title: NSString; message 'title';
@@ -159,25 +157,25 @@ var
     function copyWithZone(zone_: NSZonePtr): id;
     procedure encodeWithCoder(aCoder: NSCoder);
     function initWithCoder(aDecoder: NSCoder): id;
-  end; external;
+  end;
 
 { NSSubmenuActionCategory }
-  NSSubmenuActionCategory = objccategory(NSMenu)
+  NSSubmenuActionCategory = objccategory external (NSMenu)
     procedure submenuAction(sender: id); message 'submenuAction:';
-  end; external;
+  end;
 
 { NSMenuValidationCategory }
-  NSMenuValidationCategory = objccategory(NSObject)
+  NSMenuValidationCategory = objccategory external (NSObject)
     function validateMenuItem(menuItem: NSMenuItem): Boolean; message 'validateMenuItem:';
-  end; external;
+  end;
 
 { NSMenuPropertiesToUpdateCategory }
-  NSMenuPropertiesToUpdateCategory = objccategory(NSMenu)
+  NSMenuPropertiesToUpdateCategory = objccategory external (NSMenu)
     function propertiesToUpdate: NSMenuProperties; message 'propertiesToUpdate';
-  end; external;
+  end;
 
 { NSDeprecated_NSMenuCategory }
-  NSDeprecated_NSMenuCategory = objccategory(NSMenu)
+  NSDeprecated_NSMenuCategory = objccategory external name 'NSDeprecated' (NSMenu)
     procedure setMenuRepresentation(menuRep: id); message 'setMenuRepresentation:'; deprecated 'in Mac OS X 10.2 and later';
     function menuRepresentation: id; message 'menuRepresentation'; deprecated 'in Mac OS X 10.2 and later';
     procedure setContextMenuRepresentation(menuRep: id); message 'setContextMenuRepresentation:'; deprecated 'in Mac OS X 10.2 and later';
@@ -189,7 +187,7 @@ var
     function isAttached: Boolean; message 'isAttached'; deprecated 'in Mac OS X 10.2 and later';
     procedure sizeToFit; message 'sizeToFit'; deprecated 'in Mac OS X 10.2 and later';
     function locationForSubmenu(aSubmenu: NSMenu): NSPoint; message 'locationForSubmenu:'; deprecated 'in Mac OS X 10.2 and later';
-  end; external name 'NSDeprecated';
+  end;
 
 {$endif}
 {$endif}
@@ -198,7 +196,7 @@ var
 {$define NSMENU_PAS_P}
   
 { NSMenuDelegate Protocol }
-  NSMenuDelegateProtocol = objcprotocol
+  NSMenuDelegateProtocol = objcprotocol external name 'NSMenuDelegate'
     procedure menuNeedsUpdate(menu: NSMenu); message 'menuNeedsUpdate:';
     function numberOfItemsInMenu(menu: NSMenu): NSInteger; message 'numberOfItemsInMenu:';
     function menu_updateItem_atIndex_shouldCancel(menu: NSMenu; item: NSMenuItem; index: NSInteger; shouldCancel: Boolean): Boolean; message 'menu:updateItem:atIndex:shouldCancel:';
@@ -207,6 +205,6 @@ var
     procedure menuDidClose(menu: NSMenu); message 'menuDidClose:';
     procedure menu_willHighlightItem(menu: NSMenu; item: NSMenuItem); message 'menu:willHighlightItem:';
     function confinementRectForMenu_onScreen(menu: NSMenu; screen: NSScreen): NSRect; message 'confinementRectForMenu:onScreen:';
-  end; external name 'NSMenuDelegate';
+  end;
 {$endif}
 {$endif}

packages/cocoaint/src/appkit/NSMenuItem.inc

@@ -1,5 +1,5 @@
 { Parsed from Appkit.framework NSMenuItem.h }
-{ Version: 2.1.2 - Wed Dec 8 10:06:06 CET 2010 }
+{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
 
 
 {$ifdef TYPES}
@@ -42,7 +42,7 @@
 {$define NSMENUITEM_PAS_C}
 
 { NSMenuItem }
-  NSMenuItem = objcclass(NSObject, NSCopyingProtocol, NSCodingProtocol, NSValidatedUserInterfaceItemProtocol)
+  NSMenuItem = objcclass external (NSObject, NSCopyingProtocol, NSCodingProtocol, NSValidatedUserInterfaceItemProtocol)
   private
     _menu: NSMenu;
     _title: NSString;
@@ -81,8 +81,6 @@
       end;
     
   public
-    class function alloc: NSMenuItem; message 'alloc';
-
     class procedure setUsesUserKeyEquivalents(flag: Boolean); message 'setUsesUserKeyEquivalents:';
     class function usesUserKeyEquivalents: Boolean; message 'usesUserKeyEquivalents';
     class function separatorItem: NSMenuItem; message 'separatorItem';
@@ -141,19 +139,19 @@
     function copyWithZone(zone_: NSZonePtr): id;
     procedure encodeWithCoder(aCoder: NSCoder);
     function initWithCoder(aDecoder: NSCoder): id;
-  end; external;
+  end;
 
 { NSViewEnclosingMenuItemCategory }
-  NSViewEnclosingMenuItemCategory = objccategory(NSView)
+  NSViewEnclosingMenuItemCategory = objccategory external (NSView)
     function enclosingMenuItem: NSMenuItem; message 'enclosingMenuItem';
-  end; external;
+  end;
 
 { NSDeprecated_NSMenuItemCategory }
-  NSDeprecated_NSMenuItemCategory = objccategory(NSMenuItem)
+  NSDeprecated_NSMenuItemCategory = objccategory external name 'NSDeprecated' (NSMenuItem)
     procedure setMnemonicLocation(location: NSUInteger); message 'setMnemonicLocation:'; deprecated 'in Mac OS X 10.6 and later';
     function mnemonicLocation: NSUInteger; message 'mnemonicLocation'; deprecated 'in Mac OS X 10.6 and later';
     function mnemonic: NSString; message 'mnemonic'; deprecated 'in Mac OS X 10.6 and later';
-  end; external name 'NSDeprecated';
+  end;
 
 {$endif}
 {$endif}

packages/cocoaint/src/appkit/NSMenuItemCell.inc

@@ -1,5 +1,5 @@
 { Parsed from Appkit.framework NSMenuItemCell.h }
-{ Version: 2.1.2 - Wed Dec 8 10:06:06 CET 2010 }
+{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
 
 
 {$ifdef TYPES}
@@ -42,7 +42,7 @@
 {$define NSMENUITEMCELL_PAS_C}
 
 { NSMenuItemCell }
-  NSMenuItemCell = objcclass(NSButtonCell)
+  NSMenuItemCell = objcclass external (NSButtonCell)
   private
     _extraData: id;
     _stateImageSize: NSSize;
@@ -64,8 +64,6 @@
       end;
     
   public
-    class function alloc: NSMenuItemCell; message 'alloc';
-
     procedure setMenuItem(item: NSMenuItem); message 'setMenuItem:';
     function menuItem: NSMenuItem; message 'menuItem';
     procedure setMenuView(menuView_: NSMenuView); message 'setMenuView:';
@@ -89,7 +87,7 @@
     procedure drawKeyEquivalentWithFrame_inView(cellFrame: NSRect; controlView_: NSView); message 'drawKeyEquivalentWithFrame:inView:';
     procedure drawBorderAndBackgroundWithFrame_inView(cellFrame: NSRect; controlView_: NSView); message 'drawBorderAndBackgroundWithFrame:inView:';
     function tag: NSInteger; message 'tag';
-  end; external;
+  end;
 
 {$endif}
 {$endif}

packages/cocoaint/src/appkit/NSMenuView.inc

@@ -1,5 +1,5 @@
 { Parsed from Appkit.framework NSMenuView.h }
-{ Version: 2.1.2 - Wed Dec 8 10:06:06 CET 2010 }
+{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
 
 
 {$ifdef TYPES}
@@ -42,7 +42,7 @@
 {$define NSMENUVIEW_PAS_C}
 
 { NSMenuView }
-  NSMenuView = objcclass(NSView)
+  NSMenuView = objcclass external (NSView)
   private
     _menu: NSMenu;
     _cells: NSMutableArray;
@@ -82,8 +82,6 @@
       end;
     
   public
-    class function alloc: NSMenuView; message 'alloc';
-
     class function menuBarHeight: CGFloat; message 'menuBarHeight';
     function initWithFrame(frame_: NSRect): id; message 'initWithFrame:';
     function initAsTearOff: id; message 'initAsTearOff';
@@ -126,7 +124,7 @@
     function trackWithEvent(event: NSEvent): Boolean; message 'trackWithEvent:';
     function horizontalEdgePadding: CGFloat; message 'horizontalEdgePadding';
     procedure setHorizontalEdgePadding(pad: CGFloat); message 'setHorizontalEdgePadding:';
-  end; external;
+  end;
 
 {$endif}
 {$endif}

packages/cocoaint/src/appkit/NSMovie.inc

@@ -1,5 +1,5 @@
 { Parsed from Appkit.framework NSMovie.h }
-{ Version: 2.1.2 - Wed Dec 8 10:06:06 CET 2010 }
+{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
 
 
 {$ifdef TYPES}
@@ -42,7 +42,7 @@
 {$define NSMOVIE_PAS_C}
 
 { NSMovie }
-  NSMovie = objcclass(NSObject, NSCodingProtocol)
+  NSMovie = objcclass external (NSObject, NSCodingProtocol)
   private
     _movie: Pointer;
     _url: NSURL;
@@ -58,8 +58,6 @@
     _reserved2: clong;
     
   public
-    class function alloc: NSMovie; message 'alloc';
-
     function initWithMovie(movie: Pointer): id; message 'initWithMovie:'; deprecated 'in Mac OS X 10.5 and later';
     function initWithURL_byReference(url: NSURL; byRef: Boolean): id; message 'initWithURL:byReference:'; deprecated 'in Mac OS X 10.5 and later';
     function initWithPasteboard(pasteboard: NSPasteboard): id; message 'initWithPasteboard:'; deprecated 'in Mac OS X 10.5 and later';
@@ -72,7 +70,7 @@
     { Adopted Protocols }
     procedure encodeWithCoder(aCoder: NSCoder);
     function initWithCoder(aDecoder: NSCoder): id;
-  end; external;
+  end;
 
 {$endif}
 {$endif}

packages/cocoaint/src/appkit/NSMovieView.inc

@@ -1,5 +1,5 @@
 { Parsed from Appkit.framework NSMovieView.h }
-{ Version: 2.1.2 - Wed Dec 8 10:06:06 CET 2010 }
+{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
 
 
 {$ifdef TYPES}
@@ -72,7 +72,7 @@ __MVFlagsPtr = ^__MVFlags;
 {$define NSMOVIEVIEW_PAS_C}
 
 { NSMovieView }
-  NSMovieView = objcclass(NSView, NSUserInterfaceValidationsProtocol)
+  NSMovieView = objcclass external (NSView, NSUserInterfaceValidationsProtocol)
   private
     _fMovie: NSMovie;
     _fRate: single;
@@ -84,8 +84,6 @@ __MVFlagsPtr = ^__MVFlags;
     _fReserved3: culong;
     
   public
-    class function alloc: NSMovieView; message 'alloc';
-
     procedure setMovie(movie: NSMovie); message 'setMovie:'; deprecated 'in Mac OS X 10.5 and later';
     function movie: NSMovie; message 'movie'; deprecated 'in Mac OS X 10.5 and later';
     function movieController: Pointer; message 'movieController'; deprecated 'in Mac OS X 10.5 and later';
@@ -125,7 +123,7 @@ __MVFlagsPtr = ^__MVFlags;
 
     { Adopted Protocols }
     function validateUserInterfaceItem(anItem: id): Boolean;
-  end; external;
+  end;
 
 {$endif}
 {$endif}

packages/cocoaint/src/appkit/NSNib.inc

@@ -1,5 +1,5 @@
 { Parsed from Appkit.framework NSNib.h }
-{ Version: 2.1.2 - Wed Dec 8 10:06:06 CET 2010 }
+{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
 
 
 {$ifdef TYPES}
@@ -47,7 +47,7 @@ var
 {$define NSNIB_PAS_C}
 
 { NSNib }
-  NSNib = objcclass(NSObject, NSCodingProtocol)
+  NSNib = objcclass external (NSObject, NSCodingProtocol)
   private
     _data: NSData;
     _images: NSArray;
@@ -65,8 +65,6 @@ var
     reserved2: id;
     
   public
-    class function alloc: NSNib; message 'alloc';
-
     function initWithContentsOfURL(nibFileURL: NSURL): id; message 'initWithContentsOfURL:';
     function initWithNibNamed_bundle(nibName: NSString; bundle: NSBundle): id; message 'initWithNibNamed:bundle:';
     function instantiateNibWithExternalNameTable(externalNameTable: NSDictionary): Boolean; message 'instantiateNibWithExternalNameTable:';
@@ -75,7 +73,7 @@ var
     { Adopted Protocols }
     procedure encodeWithCoder(aCoder: NSCoder);
     function initWithCoder(aDecoder: NSCoder): id;
-  end; external;
+  end;
 
 {$endif}
 {$endif}

packages/cocoaint/src/appkit/NSNibLoading.inc

@@ -1,5 +1,5 @@
 { Parsed from Appkit.framework NSNibLoading.h }
-{ Version: 2.1.2 - Wed Dec 8 10:06:06 CET 2010 }
+{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
 
 
 {$ifdef TYPES}
@@ -39,15 +39,15 @@
 {$define NSNIBLOADING_PAS_C}
 
 { NSNibLoadingCategory }
-  NSNibLoadingCategory = objccategory(NSBundle)
+  NSNibLoadingCategory = objccategory external (NSBundle)
     class function loadNibFile_externalNameTable_withZone(fileName: NSString; context: NSDictionary; zone_: NSZonePtr): Boolean; message 'loadNibFile:externalNameTable:withZone:';
     class function loadNibNamed_owner(nibName: NSString; owner: id): Boolean; message 'loadNibNamed:owner:';
-  end; external;
+  end;
 
 { NSNibAwakingCategory }
-  NSNibAwakingCategory = objccategory(NSObject)
+  NSNibAwakingCategory = objccategory external (NSObject)
     procedure awakeFromNib; message 'awakeFromNib';
-  end; external;
+  end;
 
 {$endif}
 {$endif}

packages/cocoaint/src/appkit/NSObjectController.inc

@@ -1,5 +1,5 @@
 { Parsed from Appkit.framework NSObjectController.h }
-{ Version: 2.1.2 - Wed Dec 8 10:06:06 CET 2010 }
+{ Version: 2.1.4 - Sun Jan 2 15:08:20 CET 2011 }
 
 
 {$ifdef TYPES}
@@ -42,7 +42,7 @@
 {$define NSOBJECTCONTROLLER_PAS_C}
 
 { NSObjectController }
-  NSObjectController = objcclass(NSController)
+  NSObjectController = objcclass external (NSController)
   private
     _reserved3: Pointer;
     _managedProxy: id;
@@ -68,8 +68,6 @@
     _objectHandler: id;
     
   public
-    class function alloc: NSObjectController; message 'alloc';
-
     function initWithContent(content_: id): id; message 'initWithContent:';
     procedure setContent(content_: id); message 'setContent:';
     function content: id; message 'content';
@@ -90,10 +88,10 @@
     procedure remove(sender: id); message 'remove:';
     function canRemove: Boolean; message 'canRemove';
     function validateUserInterfaceItem(item: id): Boolean; message 'validateUserInterfaceItem:';
-  end; external;
+  end;
 
 { NSManagedControllerCategory }
-  NSManagedControllerCategory = objccategory(NSObjectController)
+  NSManagedControllerCategory = objccategory external (NSObjectController)
     function managedObjectContext: NSManagedObjectContext; message 'managedObjectContext';
     procedure setManagedObjectContext(managedObjectContext_: NSManagedObjectContext); message 'setManagedObjectContext:';
     function entityName: NSString; message 'entityName';
@@ -105,7 +103,7 @@
     procedure setUsesLazyFetching(enabled: Boolean); message 'setUsesLazyFetching:';
     function usesLazyFetching: Boolean; message 'usesLazyFetching';
     function defaultFetchRequest: NSFetchRequest; message 'defaultFetchRequest';
-  end; external;
+  end;
 
 {$endif}
 {$endif}

packages/cocoaint/src/appkit/NSOpenGL.inc

@@ -1,5 +1,5 @@
 { Parsed from Appkit.framework NSOpenGL.h }
-{ Version: 2.1.2 - Wed Dec 8 10:06:06 CET 2010 }
+{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
 
 
 {$ifdef TYPES}
@@ -131,7 +131,7 @@ procedure NSOpenGLGetVersion(major: GLintPtr; minor: GLintPtr); cdecl; external;
 {$define NSOPENGL_PAS_C}
 
 { NSOpenGLPixelFormat }
-  NSOpenGLPixelFormat = objcclass(NSObject, NSCodingProtocol)
+  NSOpenGLPixelFormat = objcclass external (NSObject, NSCodingProtocol)
   private
     _pixelFormatAuxiliary: NSOpenGLPixelFormatAuxiliaryPtr;
     _pixelAttributes: NSData;
@@ -140,8 +140,6 @@ procedure NSOpenGLGetVersion(major: GLintPtr; minor: GLintPtr); cdecl; external;
     _reserved3: NSInteger;
     
   public
-    class function alloc: NSOpenGLPixelFormat; message 'alloc';
-
     function initWithAttributes(attribs: NSOpenGLPixelFormatAttributePtr): id; message 'initWithAttributes:';
     function initWithData(attribs: NSData): id; message 'initWithData:';
     function initWithCGLPixelFormatObj(format: Pointer): id; message 'initWithCGLPixelFormatObj:';
@@ -154,18 +152,16 @@ procedure NSOpenGLGetVersion(major: GLintPtr; minor: GLintPtr); cdecl; external;
     { Adopted Protocols }
     procedure encodeWithCoder(aCoder: NSCoder);
     function initWithCoder(aDecoder: NSCoder): id;
-  end; external;
+  end;
 
 { NSOpenGLPixelBuffer }
-  NSOpenGLPixelBuffer = objcclass(NSObject)
+  NSOpenGLPixelBuffer = objcclass external (NSObject)
   private
     __pixelBufferAuxiliary: Pointer;
     _reserved1: Pointer;
     _reserved2: Pointer;
     
   public
-    class function alloc: NSOpenGLPixelBuffer; message 'alloc';
-
     function initWithTextureTarget_textureInternalFormat_textureMaxMipMapLevel_pixelsWide_pixelsHigh(target: GLenum; format: GLenum; maxLevel: GLint; pixelsWide_: GLsizei; pixelsHigh_: GLsizei): id; message 'initWithTextureTarget:textureInternalFormat:textureMaxMipMapLevel:pixelsWide:pixelsHigh:';
     function initWithCGLPBufferObj(pbuffer: Pointer): id; message 'initWithCGLPBufferObj:';
     function CGLPBufferObj: Pointer; message 'CGLPBufferObj';
@@ -174,17 +170,15 @@ procedure NSOpenGLGetVersion(major: GLintPtr; minor: GLintPtr); cdecl; external;
     function textureTarget: GLenum; message 'textureTarget';
     function textureInternalFormat: GLenum; message 'textureInternalFormat';
     function textureMaxMipMapLevel: GLint; message 'textureMaxMipMapLevel';
-  end; external;
+  end;
 
 { NSOpenGLContext }
-  NSOpenGLContext = objcclass(NSObject)
+  NSOpenGLContext = objcclass external (NSObject)
   private
     _view: NSView;
     _contextAuxiliary: NSOpenGLContextAuxiliaryPtr;
     
   public
-    class function alloc: NSOpenGLContext; message 'alloc';
-
     function initWithFormat_shareContext(format: NSOpenGLPixelFormat; share: NSOpenGLContext): id; message 'initWithFormat:shareContext:';
     function initWithCGLContextObj(context: Pointer): id; message 'initWithCGLContextObj:';
     procedure setView(view_: NSView); message 'setView:';
@@ -209,7 +203,7 @@ procedure NSOpenGLGetVersion(major: GLintPtr; minor: GLintPtr); cdecl; external;
     function pixelBufferCubeMapFace: GLenum; message 'pixelBufferCubeMapFace';
     function pixelBufferMipMapLevel: GLint; message 'pixelBufferMipMapLevel';
     procedure setTextureImageToPixelBuffer_colorBuffer(pixelBuffer_: NSOpenGLPixelBuffer; source: GLenum); message 'setTextureImageToPixelBuffer:colorBuffer:';
-  end; external;
+  end;
 
 {$endif}
 {$endif}

packages/cocoaint/src/appkit/NSOpenGLView.inc

@@ -1,5 +1,5 @@
 { Parsed from Appkit.framework NSOpenGLView.h }
-{ Version: 2.1.2 - Wed Dec 8 10:06:06 CET 2010 }
+{ Version: 2.1.4 - Sun Jan 2 15:08:20 CET 2011 }
 
 
 {$ifdef TYPES}
@@ -42,7 +42,7 @@
 {$define NSOPENGLVIEW_PAS_C}
 
 { NSOpenGLView }
-  NSOpenGLView = objcclass(NSView)
+  NSOpenGLView = objcclass external (NSView)
   private
     _openGLContext: NSOpenGLContext;
     _pixelFormat: NSOpenGLPixelFormat;
@@ -51,8 +51,6 @@
     _reserved3: NSInteger;
     
   public
-    class function alloc: NSOpenGLView; message 'alloc';
-
     class function defaultPixelFormat: NSOpenGLPixelFormat; message 'defaultPixelFormat';
     function initWithFrame_pixelFormat(frameRect: NSRect; format: NSOpenGLPixelFormat): id; message 'initWithFrame:pixelFormat:';
     procedure setOpenGLContext(context: NSOpenGLContext); message 'setOpenGLContext:';
@@ -63,7 +61,7 @@
     procedure setPixelFormat(pixelFormat_: NSOpenGLPixelFormat); message 'setPixelFormat:';
     function pixelFormat: NSOpenGLPixelFormat; message 'pixelFormat';
     procedure prepareOpenGL; message 'prepareOpenGL';
-  end; external;
+  end;
 
 {$endif}
 {$endif}

packages/cocoaint/src/appkit/NSOpenPanel.inc

@@ -1,5 +1,5 @@
 { Parsed from Appkit.framework NSOpenPanel.h }
-{ Version: 2.1.2 - Wed Dec 8 10:06:06 CET 2010 }
+{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
 
 
 {$ifdef TYPES}
@@ -42,14 +42,12 @@
 {$define NSOPENPANEL_PAS_C}
 
 { NSOpenPanel }
-  NSOpenPanel = objcclass(NSSavePanel)
+  NSOpenPanel = objcclass external (NSSavePanel)
   private
         _reservedOpenPanel: array[0..3] of char;
     _privateOpenPanel: Pointer;
     
   public
-    class function alloc: NSOpenPanel; message 'alloc';
-
     class function openPanel: NSOpenPanel; message 'openPanel';
     function URLs: NSArray; message 'URLs';
     function resolvesAliases: Boolean; message 'resolvesAliases';
@@ -60,16 +58,16 @@
     procedure setAllowsMultipleSelection(flag: Boolean); message 'setAllowsMultipleSelection:';
     function canChooseFiles: Boolean; message 'canChooseFiles';
     procedure setCanChooseFiles(flag: Boolean); message 'setCanChooseFiles:';
-  end; external;
+  end;
 
 { NSDeprecated_NSOpenPanelCategory }
-  NSDeprecated_NSOpenPanelCategory = objccategory(NSOpenPanel)
+  NSDeprecated_NSOpenPanelCategory = objccategory external name 'NSDeprecated' (NSOpenPanel)
     function filenames: NSArray; message 'filenames';
     procedure beginSheetForDirectory_file_types_modalForWindow_modalDelegate_didEndSelector_contextInfo(path: NSString; name: NSString; fileTypes: NSArray; docWindow: NSWindow; delegate_: id; didEndSelector: SEL; contextInfo: Pointer); message 'beginSheetForDirectory:file:types:modalForWindow:modalDelegate:didEndSelector:contextInfo:';
     procedure beginForDirectory_file_types_modelessDelegate_didEndSelector_contextInfo(path: NSString; name: NSString; fileTypes: NSArray; delegate_: id; didEndSelector: SEL; contextInfo: Pointer); message 'beginForDirectory:file:types:modelessDelegate:didEndSelector:contextInfo:';
     function runModalForDirectory_file_types(path: NSString; name: NSString; fileTypes: NSArray): NSInteger; message 'runModalForDirectory:file:types:';
     function runModalForTypes(fileTypes: NSArray): NSInteger; message 'runModalForTypes:';
-  end; external name 'NSDeprecated';
+  end;
 
 {$endif}
 {$endif}

packages/cocoaint/src/appkit/NSOutlineView.inc

@@ -1,5 +1,5 @@
 { Parsed from Appkit.framework NSOutlineView.h }
-{ Version: 2.1.2 - Wed Dec 8 10:06:06 CET 2010 }
+{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
 
 
 {$ifdef TYPES}
@@ -131,7 +131,7 @@ var
 {$define NSOUTLINEVIEW_PAS_C}
 
 { NSOutlineView }
-  NSOutlineView = objcclass(NSTableView)
+  NSOutlineView = objcclass external (NSTableView)
   private
     _numberOfRows: NSInteger;
     __rowEntryTree: Pointer;
@@ -159,8 +159,6 @@ var
     _ovReserved: id;
     
   public
-    class function alloc: NSOutlineView; message 'alloc';
-
     procedure setDelegate(anObject: id); message 'setDelegate:';
     function delegate: id; message 'delegate';
     procedure setDataSource(aSource: id); message 'setDataSource:';
@@ -191,10 +189,10 @@ var
     function shouldCollapseAutoExpandedItemsForDeposited(deposited: Boolean): Boolean; message 'shouldCollapseAutoExpandedItemsForDeposited:';
     function autosaveExpandedItems: Boolean; message 'autosaveExpandedItems';
     procedure setAutosaveExpandedItems(save: Boolean); message 'setAutosaveExpandedItems:';
-  end; external;
+  end;
 
 { NSOutlineViewNotificationsCategory }
-  NSOutlineViewNotificationsCategory = objccategory(NSObject)
+  NSOutlineViewNotificationsCategory = objccategory external (NSObject)
     procedure outlineViewSelectionDidChange(notification: NSNotification); message 'outlineViewSelectionDidChange:';
     procedure outlineViewColumnDidMove(notification: NSNotification); message 'outlineViewColumnDidMove:';
     procedure outlineViewColumnDidResize(notification: NSNotification); message 'outlineViewColumnDidResize:';
@@ -203,7 +201,7 @@ var
     procedure outlineViewItemDidExpand(notification: NSNotification); message 'outlineViewItemDidExpand:';
     procedure outlineViewItemWillCollapse(notification: NSNotification); message 'outlineViewItemWillCollapse:';
     procedure outlineViewItemDidCollapse(notification: NSNotification); message 'outlineViewItemDidCollapse:';
-  end; external;
+  end;
 
 {$endif}
 {$endif}
@@ -212,7 +210,7 @@ var
 {$define NSOUTLINEVIEW_PAS_P}
   
 { NSOutlineViewDataSource Protocol }
-  NSOutlineViewDataSourceProtocol = objcprotocol
+  NSOutlineViewDataSourceProtocol = objcprotocol external name 'NSOutlineViewDataSource'
     function outlineView_child_ofItem(outlineView: NSOutlineView; index: NSInteger; item: id): id; message 'outlineView:child:ofItem:';
     function outlineView_isItemExpandable(outlineView: NSOutlineView; item: id): Boolean; message 'outlineView:isItemExpandable:';
     function outlineView_numberOfChildrenOfItem(outlineView: NSOutlineView; item: id): NSInteger; message 'outlineView:numberOfChildrenOfItem:';
@@ -225,10 +223,10 @@ var
     function outlineView_validateDrop_proposedItem_proposedChildIndex(outlineView: NSOutlineView; info: id; item: id; index: NSInteger): NSDragOperation; message 'outlineView:validateDrop:proposedItem:proposedChildIndex:';
     function outlineView_acceptDrop_item_childIndex(outlineView: NSOutlineView; info: id; item: id; index: NSInteger): Boolean; message 'outlineView:acceptDrop:item:childIndex:';
     function outlineView_namesOfPromisedFilesDroppedAtDestination_forDraggedItems(outlineView: NSOutlineView; dropDestination: NSURL; items: NSArray): NSArray; message 'outlineView:namesOfPromisedFilesDroppedAtDestination:forDraggedItems:';
-  end; external name 'NSOutlineViewDataSource';
+  end;
   
 { NSOutlineViewDelegate Protocol }
-  NSOutlineViewDelegateProtocol = objcprotocol
+  NSOutlineViewDelegateProtocol = objcprotocol external name 'NSOutlineViewDelegate'
     procedure outlineView_willDisplayCell_forTableColumn_item(outlineView: NSOutlineView; cell: id; tableColumn: NSTableColumn; item: id); message 'outlineView:willDisplayCell:forTableColumn:item:';
     function outlineView_shouldEditTableColumn_item(outlineView: NSOutlineView; tableColumn: NSTableColumn; item: id): Boolean; message 'outlineView:shouldEditTableColumn:item:';
     function selectionShouldChangeInOutlineView(outlineView: NSOutlineView): Boolean; message 'selectionShouldChangeInOutlineView:';
@@ -253,6 +251,6 @@ var
     function outlineView_sizeToFitWidthOfColumn(outlineView: NSOutlineView; column: NSInteger): CGFloat; message 'outlineView:sizeToFitWidthOfColumn:';
     function outlineView_shouldReorderColumn_toColumn(outlineView: NSOutlineView; columnIndex: NSInteger; newColumnIndex: NSInteger): Boolean; message 'outlineView:shouldReorderColumn:toColumn:';
     function outlineView_shouldShowOutlineCellForItem(outlineView: NSOutlineView; item: id): Boolean; message 'outlineView:shouldShowOutlineCellForItem:';
-  end; external name 'NSOutlineViewDelegate';
+  end;
 {$endif}
 {$endif}