Rebase to revision 16946

git-svn-id: branches/svenbarth/classhelpers@16950 -

.gitattributes

@@ -1402,6 +1402,7 @@ packages/cocoaint/src/webkit/CarbonUtils.inc svneol=native#text/plain
 packages/cocoaint/src/webkit/DOM.inc svneol=native#text/plain
 packages/cocoaint/src/webkit/DOMAbstractView.inc svneol=native#text/plain
 packages/cocoaint/src/webkit/DOMAttr.inc svneol=native#text/plain
+packages/cocoaint/src/webkit/DOMBlob.inc svneol=native#text/plain
 packages/cocoaint/src/webkit/DOMCDATASection.inc svneol=native#text/plain
 packages/cocoaint/src/webkit/DOMCSS.inc svneol=native#text/plain
 packages/cocoaint/src/webkit/DOMCSSCharsetRule.inc svneol=native#text/plain
@@ -1559,8 +1560,6 @@ 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
@@ -1570,16 +1569,23 @@ packages/cocoaint/utils/cocoa-skel/src/appkit/AppKit.inc svneol=native#text/plai
 packages/cocoaint/utils/cocoa-skel/src/appkit/CIColor.inc svneol=native#text/plain
 packages/cocoaint/utils/cocoa-skel/src/coredata/CoreData.inc svneol=native#text/plain
 packages/cocoaint/utils/cocoa-skel/src/foundation/Foundation.inc svneol=native#text/plain
+packages/cocoaint/utils/cocoa-skel/src/patches/NSBundle.patch svneol=native#text/plain
+packages/cocoaint/utils/cocoa-skel/src/patches/NSObjCRuntime.patch svneol=native#text/plain
 packages/cocoaint/utils/cocoa-skel/src/quartzcore/QuartzCore.inc svneol=native#text/plain
 packages/cocoaint/utils/cocoa-skel/src/webkit/UndefinedTypes.inc svneol=native#text/plain
 packages/cocoaint/utils/cocoa-skel/src/webkit/WebKit.inc svneol=native#text/plain
+packages/cocoaint/utils/doc/How[!!-~]to[!!-~]parse[!!-~]frameworks.rtf -text svneol=unset#application/rtf
+packages/cocoaint/utils/doc/Make[!!-~]Cocoa[!!-~]Headers.txt svneol=native#text/plain
+packages/cocoaint/utils/doc/Make[!!-~]Single[!!-~]Header.txt svneol=native#text/plain
+packages/cocoaint/utils/doc/Make[!!-~]iPhone[!!-~]Headers.txt svneol=native#text/plain
 packages/cocoaint/utils/frameworks.xml svneol=native#text/plain
 packages/cocoaint/utils/install_objp.sh svneol=native#text/plain
 packages/cocoaint/utils/make-cocoa-headers.sh svneol=native#text/plain
 packages/cocoaint/utils/make-ios-headers.sh svneol=native#text/plain
 packages/cocoaint/utils/parser.php svneol=native#text/plain
 packages/cocoaint/utils/patches/cocoa-coredata-webkit.patch svneol=native#text/plain
-packages/cocoaint/utils/patches/uikit.patch svneol=native#text/plain
+packages/cocoaint/utils/patches/uikit-3.2.patch svneol=native#text/plain
+packages/cocoaint/utils/patches/uikit-4.2.patch svneol=native#text/plain
 packages/cocoaint/utils/source/objp.php svneol=native#text/plain
 packages/cocoaint/utils/source/objp_base.php svneol=native#text/plain
 packages/cocoaint/utils/source/utilities.php svneol=native#text/plain
@@ -1588,6 +1594,7 @@ packages/cocoaint/utils/uikit-skel/src/UndefinedTypes.inc svneol=native#text/pla
 packages/cocoaint/utils/uikit-skel/src/foundation/Foundation.inc svneol=native#text/plain
 packages/cocoaint/utils/uikit-skel/src/iPhoneAll.pas svneol=native#text/plain
 packages/cocoaint/utils/uikit-skel/src/opengles/OpenGLES.inc svneol=native#text/plain
+packages/cocoaint/utils/uikit-skel/src/patches/NSObjCRuntime.patch svneol=native#text/plain
 packages/cocoaint/utils/uikit-skel/src/quartzcore/QuartzCore.inc svneol=native#text/plain
 packages/cocoaint/utils/uikit-skel/src/uikit/UIKit.inc svneol=native#text/plain
 packages/dbus/Makefile svneol=native#text/plain
@@ -4051,6 +4058,15 @@ packages/libndsfpc/examples/filesystem/libfat/access_file/test1.txt svneol=nativ
 packages/libndsfpc/examples/filesystem/libfat/libfatdir/Makefile svneol=native#text/plain
 packages/libndsfpc/examples/filesystem/libfat/libfatdir/Makefile.fpc svneol=native#text/plain
 packages/libndsfpc/examples/filesystem/libfat/libfatdir/libfatdir.pp svneol=native#text/plain
+packages/libndsfpc/examples/filesystem/nitrofs/Makefile svneol=native#text/plain
+packages/libndsfpc/examples/filesystem/nitrofs/Makefile.fpc svneol=native#text/plain
+packages/libndsfpc/examples/filesystem/nitrofs/nitrodir/Makefile svneol=native#text/plain
+packages/libndsfpc/examples/filesystem/nitrofs/nitrodir/Makefile.fpc svneol=native#text/plain
+packages/libndsfpc/examples/filesystem/nitrofs/nitrodir/nitrodir.pp svneol=native#text/plain
+packages/libndsfpc/examples/filesystem/nitrofs/nitrodir/nitrofiles/dir1/test.txt svneol=native#text/plain
+packages/libndsfpc/examples/filesystem/nitrofs/nitrodir/nitrofiles/dir2/subdir1/subsubdir1/file2.txt svneol=native#text/plain
+packages/libndsfpc/examples/filesystem/nitrofs/nitrodir/nitrofiles/dir2/subdir1/test2.txt svneol=native#text/plain
+packages/libndsfpc/examples/filesystem/nitrofs/nitrodir/nitrofiles/file1.txt svneol=native#text/plain
 packages/libndsfpc/examples/graphics/3D/3D_Both_Screens/3DBothScreens.pp svneol=native#text/plain
 packages/libndsfpc/examples/graphics/3D/3D_Both_Screens/Makefile svneol=native#text/plain
 packages/libndsfpc/examples/graphics/3D/3D_Both_Screens/Makefile.fpc svneol=native#text/plain
@@ -4082,6 +4098,9 @@ packages/libndsfpc/examples/graphics/3D/Paletted_Cube/Makefile svneol=native#tex
 packages/libndsfpc/examples/graphics/3D/Paletted_Cube/Makefile.fpc svneol=native#text/plain
 packages/libndsfpc/examples/graphics/3D/Paletted_Cube/PalettedCube.pp svneol=native#text/plain
 packages/libndsfpc/examples/graphics/3D/Paletted_Cube/data/texture.bin -text svneol=unset#application/octet-stream
+packages/libndsfpc/examples/graphics/3D/Paletted_Cube/data/texture10_COMP_pal.bin -text
+packages/libndsfpc/examples/graphics/3D/Paletted_Cube/data/texture10_COMP_tex.bin -text
+packages/libndsfpc/examples/graphics/3D/Paletted_Cube/data/texture10_COMP_texExt.bin -text
 packages/libndsfpc/examples/graphics/3D/Paletted_Cube/data/texture1_RGB16_pal.bin -text svneol=unset#application/octet-stream
 packages/libndsfpc/examples/graphics/3D/Paletted_Cube/data/texture1_RGB16_tex.bin -text
 packages/libndsfpc/examples/graphics/3D/Paletted_Cube/data/texture2_RGB16_pal.bin -text
@@ -9687,6 +9706,7 @@ tests/test/tobjc35h.pp svneol=native#text/plain
 tests/test/tobjc35i.pp svneol=native#text/plain
 tests/test/tobjc36.pp svneol=native#text/plain
 tests/test/tobjc36a.pp svneol=native#text/plain
+tests/test/tobjc37.pp svneol=native#text/plain
 tests/test/tobjc4.pp svneol=native#text/plain
 tests/test/tobjc4a.pp svneol=native#text/plain
 tests/test/tobjc5.pp svneol=native#text/plain

.gitignore

@@ -685,15 +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/cocoa-skel/src/patches/*.bak
+packages/cocoaint/utils/cocoa-skel/src/patches/*.exe
+packages/cocoaint/utils/cocoa-skel/src/patches/*.o
+packages/cocoaint/utils/cocoa-skel/src/patches/*.ppu
+packages/cocoaint/utils/cocoa-skel/src/patches/*.s
+packages/cocoaint/utils/cocoa-skel/src/patches/Package.fpc
+packages/cocoaint/utils/cocoa-skel/src/patches/build-stamp.*
+packages/cocoaint/utils/cocoa-skel/src/patches/fpcmade.*
+packages/cocoaint/utils/cocoa-skel/src/patches/units
 packages/cocoaint/utils/fpcmade.*
 packages/cocoaint/utils/units
 packages/dbus/*.bak
@@ -3351,6 +3351,78 @@ packages/libndsfpc/examples/filesystem/libfat/libfatdir/build-stamp.*
 packages/libndsfpc/examples/filesystem/libfat/libfatdir/fpcmade.*
 packages/libndsfpc/examples/filesystem/libfat/libfatdir/units
 packages/libndsfpc/examples/filesystem/libfat/units
+packages/libndsfpc/examples/filesystem/nitrofs/*.bak
+packages/libndsfpc/examples/filesystem/nitrofs/*.exe
+packages/libndsfpc/examples/filesystem/nitrofs/*.o
+packages/libndsfpc/examples/filesystem/nitrofs/*.ppu
+packages/libndsfpc/examples/filesystem/nitrofs/*.s
+packages/libndsfpc/examples/filesystem/nitrofs/Package.fpc
+packages/libndsfpc/examples/filesystem/nitrofs/build-stamp.*
+packages/libndsfpc/examples/filesystem/nitrofs/fpcmade.*
+packages/libndsfpc/examples/filesystem/nitrofs/nitrodir/*.bak
+packages/libndsfpc/examples/filesystem/nitrofs/nitrodir/*.exe
+packages/libndsfpc/examples/filesystem/nitrofs/nitrodir/*.o
+packages/libndsfpc/examples/filesystem/nitrofs/nitrodir/*.ppu
+packages/libndsfpc/examples/filesystem/nitrofs/nitrodir/*.s
+packages/libndsfpc/examples/filesystem/nitrofs/nitrodir/Package.fpc
+packages/libndsfpc/examples/filesystem/nitrofs/nitrodir/build-stamp.*
+packages/libndsfpc/examples/filesystem/nitrofs/nitrodir/fpcmade.*
+packages/libndsfpc/examples/filesystem/nitrofs/nitrodir/nitrofiles/*.bak
+packages/libndsfpc/examples/filesystem/nitrofs/nitrodir/nitrofiles/*.exe
+packages/libndsfpc/examples/filesystem/nitrofs/nitrodir/nitrofiles/*.o
+packages/libndsfpc/examples/filesystem/nitrofs/nitrodir/nitrofiles/*.ppu
+packages/libndsfpc/examples/filesystem/nitrofs/nitrodir/nitrofiles/*.s
+packages/libndsfpc/examples/filesystem/nitrofs/nitrodir/nitrofiles/Package.fpc
+packages/libndsfpc/examples/filesystem/nitrofs/nitrodir/nitrofiles/build-stamp.*
+packages/libndsfpc/examples/filesystem/nitrofs/nitrodir/nitrofiles/dir1/*.bak
+packages/libndsfpc/examples/filesystem/nitrofs/nitrodir/nitrofiles/dir1/*.exe
+packages/libndsfpc/examples/filesystem/nitrofs/nitrodir/nitrofiles/dir1/*.o
+packages/libndsfpc/examples/filesystem/nitrofs/nitrodir/nitrofiles/dir1/*.ppu
+packages/libndsfpc/examples/filesystem/nitrofs/nitrodir/nitrofiles/dir1/*.s
+packages/libndsfpc/examples/filesystem/nitrofs/nitrodir/nitrofiles/dir1/Package.fpc
+packages/libndsfpc/examples/filesystem/nitrofs/nitrodir/nitrofiles/dir1/build-stamp.*
+packages/libndsfpc/examples/filesystem/nitrofs/nitrodir/nitrofiles/dir1/fpcmade.*
+packages/libndsfpc/examples/filesystem/nitrofs/nitrodir/nitrofiles/dir1/units
+packages/libndsfpc/examples/filesystem/nitrofs/nitrodir/nitrofiles/dir2/*.bak
+packages/libndsfpc/examples/filesystem/nitrofs/nitrodir/nitrofiles/dir2/*.exe
+packages/libndsfpc/examples/filesystem/nitrofs/nitrodir/nitrofiles/dir2/*.o
+packages/libndsfpc/examples/filesystem/nitrofs/nitrodir/nitrofiles/dir2/*.ppu
+packages/libndsfpc/examples/filesystem/nitrofs/nitrodir/nitrofiles/dir2/*.s
+packages/libndsfpc/examples/filesystem/nitrofs/nitrodir/nitrofiles/dir2/Package.fpc
+packages/libndsfpc/examples/filesystem/nitrofs/nitrodir/nitrofiles/dir2/build-stamp.*
+packages/libndsfpc/examples/filesystem/nitrofs/nitrodir/nitrofiles/dir2/fpcmade.*
+packages/libndsfpc/examples/filesystem/nitrofs/nitrodir/nitrofiles/dir2/subdir1/*.bak
+packages/libndsfpc/examples/filesystem/nitrofs/nitrodir/nitrofiles/dir2/subdir1/*.exe
+packages/libndsfpc/examples/filesystem/nitrofs/nitrodir/nitrofiles/dir2/subdir1/*.o
+packages/libndsfpc/examples/filesystem/nitrofs/nitrodir/nitrofiles/dir2/subdir1/*.ppu
+packages/libndsfpc/examples/filesystem/nitrofs/nitrodir/nitrofiles/dir2/subdir1/*.s
+packages/libndsfpc/examples/filesystem/nitrofs/nitrodir/nitrofiles/dir2/subdir1/Package.fpc
+packages/libndsfpc/examples/filesystem/nitrofs/nitrodir/nitrofiles/dir2/subdir1/build-stamp.*
+packages/libndsfpc/examples/filesystem/nitrofs/nitrodir/nitrofiles/dir2/subdir1/fpcmade.*
+packages/libndsfpc/examples/filesystem/nitrofs/nitrodir/nitrofiles/dir2/subdir1/subsubdir1/*.bak
+packages/libndsfpc/examples/filesystem/nitrofs/nitrodir/nitrofiles/dir2/subdir1/subsubdir1/*.exe
+packages/libndsfpc/examples/filesystem/nitrofs/nitrodir/nitrofiles/dir2/subdir1/subsubdir1/*.o
+packages/libndsfpc/examples/filesystem/nitrofs/nitrodir/nitrofiles/dir2/subdir1/subsubdir1/*.ppu
+packages/libndsfpc/examples/filesystem/nitrofs/nitrodir/nitrofiles/dir2/subdir1/subsubdir1/*.s
+packages/libndsfpc/examples/filesystem/nitrofs/nitrodir/nitrofiles/dir2/subdir1/subsubdir1/Package.fpc
+packages/libndsfpc/examples/filesystem/nitrofs/nitrodir/nitrofiles/dir2/subdir1/subsubdir1/build-stamp.*
+packages/libndsfpc/examples/filesystem/nitrofs/nitrodir/nitrofiles/dir2/subdir1/subsubdir1/fpcmade.*
+packages/libndsfpc/examples/filesystem/nitrofs/nitrodir/nitrofiles/dir2/subdir1/subsubdir1/units
+packages/libndsfpc/examples/filesystem/nitrofs/nitrodir/nitrofiles/dir2/subdir1/units
+packages/libndsfpc/examples/filesystem/nitrofs/nitrodir/nitrofiles/dir2/units
+packages/libndsfpc/examples/filesystem/nitrofs/nitrodir/nitrofiles/dir3/*.bak
+packages/libndsfpc/examples/filesystem/nitrofs/nitrodir/nitrofiles/dir3/*.exe
+packages/libndsfpc/examples/filesystem/nitrofs/nitrodir/nitrofiles/dir3/*.o
+packages/libndsfpc/examples/filesystem/nitrofs/nitrodir/nitrofiles/dir3/*.ppu
+packages/libndsfpc/examples/filesystem/nitrofs/nitrodir/nitrofiles/dir3/*.s
+packages/libndsfpc/examples/filesystem/nitrofs/nitrodir/nitrofiles/dir3/Package.fpc
+packages/libndsfpc/examples/filesystem/nitrofs/nitrodir/nitrofiles/dir3/build-stamp.*
+packages/libndsfpc/examples/filesystem/nitrofs/nitrodir/nitrofiles/dir3/fpcmade.*
+packages/libndsfpc/examples/filesystem/nitrofs/nitrodir/nitrofiles/dir3/units
+packages/libndsfpc/examples/filesystem/nitrofs/nitrodir/nitrofiles/fpcmade.*
+packages/libndsfpc/examples/filesystem/nitrofs/nitrodir/nitrofiles/units
+packages/libndsfpc/examples/filesystem/nitrofs/nitrodir/units
+packages/libndsfpc/examples/filesystem/nitrofs/units
 packages/libndsfpc/examples/filesystem/units
 packages/libndsfpc/examples/fpcmade.*
 packages/libndsfpc/examples/graphics/3D/*.bak

compiler/globals.pas

@@ -719,6 +719,10 @@ implementation
 ****************************************************************************}
 
      procedure DefaultReplacements(var s:ansistring);
+       var
+         envstr: string;
+         envvalue: pchar;
+         i: integer;
        begin
          { Replace some macros }
          Replace(s,'$FPCVERSION',version_string);
@@ -730,6 +734,29 @@ implementation
            Replace(s,'$FPCTARGET',target_os_string)
          else
            Replace(s,'$FPCTARGET',target_full_string);
+         { Replace environment variables between dollar signs }
+         i := pos('$',s);
+         while i>0 do
+          begin
+            envstr:=copy(s,i+1,length(s)-i);
+            i:=pos('$',envstr);
+            if i>0 then
+             begin
+               envstr := copy(envstr,1,i-1);
+               envvalue := GetEnvPChar(envstr);
+               if assigned(envvalue) then
+                 begin
+                 Replace(s,'$'+envstr+'$',envvalue);
+                 // Look if there is another env.var in the string
+                 i:=pos('$',s);
+                 end
+               else
+                 // if the env.var is not set, do not replace the env.variable
+                 // and stop looking for more env.var within the string
+                 i := 0;
+              FreeEnvPChar(envvalue);
+             end;
+          end;
        end;
 
 

compiler/symdef.pas

@@ -4492,7 +4492,17 @@ implementation
             psym:=tprocsym.create(nname);
             { avoid warning about this symbol being unused }
             psym.IncRefCount;
-            st.insert(psym,true);
+            { don't check for duplicates:
+               a) we checked above
+               b) in case we are in the implementation section of a unit, this
+                  will also check for this symbol in the interface section
+                  (since you normally cannot have symbols with the same name
+                   both interface and implementation), and it's possible to
+                   have class helpers for the same class in the interface and
+                   in the implementation, and they cannot be merged since only
+                   the once in the interface must be saved to the ppu/visible
+                   from other units }
+            st.insert(psym,false);
           end
         else if (psym.typ<>procsym) then
           internalerror(2009111501);

compiler/systems/t_bsd.pas

@@ -159,7 +159,15 @@ begin
                On 64bit systems, page zero is 4GB by default, so no problems
                there.
              }
-             ExeCmd[1]:='ld $PRTOBJ $OPT $DYNLINK $STATIC $GCSECTIONS $STRIP -pagezero_size 0x10000 -multiply_defined suppress -L. -o $EXE `cat $RES`';
+             { In case of valgrind, don't do that, because it cannot deal with
+               a custom pagezero size -- in general, this should not cause any
+               problems because the resources are added at the end and most
+               programs with problems that require Valgrind will have more
+               than 60KB of data (first 4KB of address space is always invalid)
+             }
+               ExeCmd[1]:='ld $PRTOBJ $OPT $DYNLINK $STATIC $GCSECTIONS $STRIP -multiply_defined suppress -L. -o $EXE `cat $RES`';
+             if not(cs_gdb_valgrind in current_settings.globalswitches) then
+               ExeCmd[1]:=ExeCmd[1]+' -pagezero_size 0x10000';
 {$else ndef cpu64bitaddr}
              ExeCmd[1]:='ld $PRTOBJ $OPT $DYNLINK $STATIC $GCSECTIONS $STRIP -multiply_defined suppress -L. -o $EXE `cat $RES`';
 {$endif ndef cpu64bitaddr}

packages/cocoaint/src/AnonClassDefinitionsWebkit.pas

@@ -204,6 +204,7 @@ type
   DOMCSSStyleDeclaration = objcclass external;
   DOMElement = objcclass external;
   DOMAttr = objcclass external;
+  DOMBlob = objcclass external;
   DOMCDATASection = objcclass external;
   DOMCharacterData = objcclass external;
   DOMComment = objcclass external;

packages/cocoaint/src/appkit/NSATSTypesetter.inc

@@ -1,6 +1,4 @@
 { Parsed from Appkit.framework NSATSTypesetter.h }
-{ Version: 2.1.4 - Sun Jan 2 15:08:20 CET 2011 }
-
 
 {$ifdef TYPES}
 {$ifndef NSATSTYPESETTER_PAS_T}

packages/cocoaint/src/appkit/NSAccessibility.inc

@@ -1,6 +1,4 @@
 { Parsed from Appkit.framework NSAccessibility.h }
-{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
-
 
 {$ifdef TYPES}
 {$ifndef NSACCESSIBILITY_PAS_T}
@@ -321,9 +319,9 @@ var
   NSAccessibilityRatingIndicatorSubrole: NSString; cvar; external;
   NSAccessibilityContentListSubrole: NSString; cvar; external;
   NSAccessibilityDefinitionListSubrole: NSString; cvar; external;
-  NSAccessibilitySortButtonRole: NSString; cvar; external;
-  NSAccessibilityHorizontialUnitsAttribute_BUT_DEPRECATED: NSString; cvar; external;
-  NSAccessibilityHorizontialUnitDescriptionAttribute_BUT_DEPRECATED: NSString; cvar; external;
+  NSAccessibilitySortButtonRole: NSString deprecated 'in Mac OS X 10.6 and later'; cvar; external;
+  NSAccessibilityHorizontialUnitsAttribute: NSString deprecated 'in Mac OS X 10.6 and later'; cvar; external;
+  NSAccessibilityHorizontialUnitDescriptionAttribute: NSString deprecated 'in Mac OS X 10.6 and later'; cvar; external;
 
 {$endif}
 {$endif}

packages/cocoaint/src/appkit/NSActionCell.inc

@@ -1,6 +1,4 @@
 { Parsed from Appkit.framework NSActionCell.h }
-{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
-
 
 {$ifdef TYPES}
 {$ifndef NSACTIONCELL_PAS_T}

packages/cocoaint/src/appkit/NSAffineTransform.inc

@@ -1,6 +1,4 @@
 { Parsed from Appkit.framework NSAffineTransform.h }
-{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
-
 
 {$ifdef TYPES}
 {$ifndef NSAFFINETRANSFORM_PAS_T}

packages/cocoaint/src/appkit/NSAlert.inc

@@ -1,6 +1,4 @@
 { Parsed from Appkit.framework NSAlert.h }
-{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
-
 
 {$ifdef TYPES}
 {$ifndef NSALERT_PAS_T}
@@ -110,8 +108,8 @@ type
     function helpAnchor: NSString; message 'helpAnchor';
     procedure setAlertStyle(style: NSAlertStyle); message 'setAlertStyle:';
     function alertStyle: NSAlertStyle; message 'alertStyle';
-    procedure setDelegate(delegate_: id); message 'setDelegate:';
-    function delegate: id; message 'delegate';
+    procedure setDelegate(delegate_: NSAlertDelegateProtocol); message 'setDelegate:';
+    function delegate: NSAlertDelegateProtocol; message 'delegate';
     procedure setShowsSuppressionButton(flag: Boolean); message 'setShowsSuppressionButton:';
     function showsSuppressionButton: Boolean; message 'showsSuppressionButton';
     function suppressionButton: NSButton; message 'suppressionButton';
@@ -132,6 +130,7 @@ type
   
 { NSAlertDelegate Protocol }
   NSAlertDelegateProtocol = objcprotocol external name 'NSAlertDelegate'
+  optional
     function alertShowHelp(alert: NSAlert): Boolean; message 'alertShowHelp:';
   end;
 {$endif}

packages/cocoaint/src/appkit/NSAnimation.inc

@@ -1,6 +1,4 @@
 { Parsed from Appkit.framework NSAnimation.h }
-{ Version: 2.1.4 - Sun Jan 2 15:08:20 CET 2011 }
-
 
 {$ifdef TYPES}
 {$ifndef NSANIMATION_PAS_T}
@@ -138,8 +136,8 @@ var
     procedure setAnimationCurve(curve: NSAnimationCurve); message 'setAnimationCurve:';
     function animationCurve: NSAnimationCurve; message 'animationCurve';
     function currentValue: single; message 'currentValue';
-    procedure setDelegate(delegate_: id); message 'setDelegate:';
-    function delegate: id; message 'delegate';
+    procedure setDelegate(delegate_: NSAnimationDelegateProtocol); message 'setDelegate:';
+    function delegate: NSAnimationDelegateProtocol; message 'delegate';
     function progressMarks: NSArray; message 'progressMarks';
     procedure setProgressMarks(progressMarks_: NSArray); message 'setProgressMarks:';
     procedure addProgressMark(progressMark: NSAnimationProgress); message 'addProgressMark:';
@@ -191,6 +189,7 @@ var
   
 { NSAnimationDelegate Protocol }
   NSAnimationDelegateProtocol = objcprotocol external name 'NSAnimationDelegate'
+  optional
     function animationShouldStart(animation: NSAnimation): Boolean; message 'animationShouldStart:';
     procedure animationDidStop(animation: NSAnimation); message 'animationDidStop:';
     procedure animationDidEnd(animation: NSAnimation); message 'animationDidEnd:';
@@ -200,6 +199,7 @@ var
   
 { NSAnimatablePropertyContainer Protocol }
   NSAnimatablePropertyContainerProtocol = objcprotocol external name 'NSAnimatablePropertyContainer'
+  optional
     function animator: id; message 'animator';
     function animations: NSDictionary; message 'animations';
     procedure setAnimations(dict: NSDictionary); message 'setAnimations:';

packages/cocoaint/src/appkit/NSAnimationContext.inc

@@ -1,6 +1,4 @@
 { Parsed from Appkit.framework NSAnimationContext.h }
-{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
-
 
 {$ifdef TYPES}
 {$ifndef NSANIMATIONCONTEXT_PAS_T}

packages/cocoaint/src/appkit/NSAppleScriptExtensions.inc

@@ -1,6 +1,4 @@
 { Parsed from Appkit.framework NSAppleScriptExtensions.h }
-{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
-
 
 {$ifdef TYPES}
 {$ifndef NSAPPLESCRIPTEXTENSIONS_PAS_T}

packages/cocoaint/src/appkit/NSApplication.inc

@@ -1,6 +1,4 @@
 { Parsed from Appkit.framework NSApplication.h }
-{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
-
 
 {$ifdef TYPES}
 {$ifndef NSAPPLICATION_PAS_T}
@@ -221,8 +219,8 @@ var
     
   public
     class function sharedApplication: NSApplication; message 'sharedApplication';
-    procedure setDelegate(anObject: id); message 'setDelegate:';
-    function delegate: id; message 'delegate';
+    procedure setDelegate(anObject: NSApplicationDelegateProtocol); message 'setDelegate:';
+    function delegate: NSApplicationDelegateProtocol; message 'delegate';
     function context: NSGraphicsContext; message 'context';
     procedure hide(sender: id); message 'hide:';
     procedure unhide(sender: id); message 'unhide:';
@@ -266,7 +264,7 @@ var
     procedure updateWindows; message 'updateWindows';
     procedure setMainMenu(aMenu: NSMenu); message 'setMainMenu:';
     function mainMenu: NSMenu; message 'mainMenu';
-    procedure setHelpMenu(helpMenu: NSMenu); message 'setHelpMenu:';
+    procedure setHelpMenu(helpMenu_: NSMenu); message 'setHelpMenu:';
     function helpMenu: NSMenu; message 'helpMenu';
     procedure setApplicationIconImage(image: NSImage); message 'setApplicationIconImage:';
     function applicationIconImage: NSImage; message 'applicationIconImage';
@@ -288,7 +286,7 @@ var
     function currentSystemPresentationOptions: NSApplicationPresentationOptions; message 'currentSystemPresentationOptions';
 
     { Adopted Protocols }
-    function validateUserInterfaceItem(anItem: id): Boolean;
+    function validateUserInterfaceItem(anItem: NSValidatedUserInterfaceItemProtocol): Boolean;
   end;
 
 { NSWindowsMenuCategory }
@@ -342,7 +340,7 @@ var
   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:';
+    procedure application_printFiles(sender: NSApplication; filenames: NSArray); message 'application:printFiles:'; deprecated 'in Mac OS X 10.4 and later';
   end;
 
 {$endif}
@@ -353,6 +351,7 @@ var
   
 { NSApplicationDelegate Protocol }
   NSApplicationDelegateProtocol = objcprotocol external name 'NSApplicationDelegate'
+  optional
     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:';

packages/cocoaint/src/appkit/NSApplicationScripting.inc

@@ -1,6 +1,4 @@
 { Parsed from Appkit.framework NSApplicationScripting.h }
-{ Version: 2.1.4 - Sun Jan 2 15:08:20 CET 2011 }
-
 
 {$ifdef TYPES}
 {$ifndef NSAPPLICATIONSCRIPTING_PAS_T}

packages/cocoaint/src/appkit/NSArrayController.inc

@@ -1,6 +1,4 @@
 { Parsed from Appkit.framework NSArrayController.h }
-{ Version: 2.1.4 - Sun Jan 2 15:08:20 CET 2011 }
-
 
 {$ifdef TYPES}
 {$ifndef NSARRAYCONTROLLER_PAS_T}

packages/cocoaint/src/appkit/NSAttributedString.inc

@@ -1,6 +1,4 @@
 { Parsed from Appkit.framework NSAttributedString.h }
-{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
-
 
 {$ifdef TYPES}
 {$ifndef NSATTRIBUTEDSTRING_PAS_T}
@@ -240,10 +238,10 @@ var
 
 { NSDeprecatedKitAdditionsCategory }
   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';
+    class function textFileTypes: NSArray; message 'textFileTypes'; deprecated 'in Mac OS X 10.5 and later';
+    class function textPasteboardTypes: NSArray; message 'textPasteboardTypes'; deprecated 'in Mac OS X 10.5 and later';
+    class function textUnfilteredFileTypes: NSArray; message 'textUnfilteredFileTypes'; deprecated 'in Mac OS X 10.5 and later';
+    class function textUnfilteredPasteboardTypes: NSArray; message 'textUnfilteredPasteboardTypes'; deprecated 'in Mac OS X 10.5 and later';
   end;
 
 { NSMutableAttributedStringKitAdditionsCategory }

packages/cocoaint/src/appkit/NSBezierPath.inc

@@ -1,6 +1,4 @@
 { Parsed from Appkit.framework NSBezierPath.h }
-{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
-
 
 {$ifdef TYPES}
 {$ifndef NSBEZIERPATH_PAS_T}

packages/cocoaint/src/appkit/NSBitmapImageRep.inc

@@ -1,6 +1,4 @@
 { Parsed from Appkit.framework NSBitmapImageRep.h }
-{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
-
 
 {$ifdef TYPES}
 {$ifndef NSBITMAPIMAGEREP_PAS_T}

packages/cocoaint/src/appkit/NSBox.inc

@@ -1,6 +1,4 @@
 { Parsed from Appkit.framework NSBox.h }
-{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
-
 
 {$ifdef TYPES}
 {$ifndef NSBOX_PAS_T}

packages/cocoaint/src/appkit/NSBrowser.inc

@@ -1,6 +1,4 @@
 { Parsed from Appkit.framework NSBrowser.h }
-{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
-
 
 {$ifdef TYPES}
 {$ifndef NSBROWSER_PAS_T}
@@ -167,8 +165,8 @@ var
     procedure setCellClass(factoryId: Pobjc_class); message 'setCellClass:';
     procedure setCellPrototype(aCell: NSCell); message 'setCellPrototype:';
     function cellPrototype: id; message 'cellPrototype';
-    procedure setDelegate(anObject: id); message 'setDelegate:';
-    function delegate: id; message 'delegate';
+    procedure setDelegate(anObject: NSBrowserDelegateProtocol); message 'setDelegate:';
+    function delegate: NSBrowserDelegateProtocol; message 'delegate';
     procedure setReusesColumns(flag: Boolean); message 'setReusesColumns:';
     function reusesColumns: Boolean; message 'reusesColumns';
     procedure setHasHorizontalScroller(flag: Boolean); message 'setHasHorizontalScroller:';
@@ -249,7 +247,7 @@ var
     function getRow_column_forPoint(row: NSIntegerPtr; column: NSIntegerPtr; point: NSPoint): Boolean; message 'getRow:column:forPoint:';
     function columnWidthForColumnContentWidth(columnContentWidth: CGFloat): CGFloat; message 'columnWidthForColumnContentWidth:';
     function columnContentWidthForColumnWidth(columnWidth: CGFloat): CGFloat; message 'columnContentWidthForColumnWidth:';
-    procedure setColumnResizingType(columnResizingType: NSBrowserColumnResizingType); message 'setColumnResizingType:';
+    procedure setColumnResizingType(columnResizingType_: NSBrowserColumnResizingType); message 'setColumnResizingType:';
     function columnResizingType: NSBrowserColumnResizingType; message 'columnResizingType';
     procedure setPrefersAllColumnUserResizing(prefersAllColumnResizing: Boolean); message 'setPrefersAllColumnUserResizing:';
     function prefersAllColumnUserResizing: Boolean; message 'prefersAllColumnUserResizing';
@@ -291,6 +289,7 @@ var
   
 { NSBrowserDelegate Protocol }
   NSBrowserDelegateProtocol = objcprotocol external name 'NSBrowserDelegate'
+  optional
     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:';
@@ -316,8 +315,8 @@ var
     function browser_namesOfPromisedFilesDroppedAtDestination_forDraggedRowsWithIndexes_inColumn(browser: NSBrowser; dropDestination: NSURL; rowIndexes: NSIndexSet; column: NSInteger): NSArray; message 'browser:namesOfPromisedFilesDroppedAtDestination:forDraggedRowsWithIndexes:inColumn:';
     function browser_canDragRowsWithIndexes_inColumn_withEvent(browser: NSBrowser; rowIndexes: NSIndexSet; column: NSInteger; event: NSEvent): Boolean; message 'browser:canDragRowsWithIndexes:inColumn:withEvent:';
     function browser_draggingImageForRowsWithIndexes_inColumn_withEvent_offset(browser: NSBrowser; rowIndexes: NSIndexSet; column: NSInteger; event: NSEvent; dragImageOffset: NSPointPointer): NSImage; message 'browser:draggingImageForRowsWithIndexes:inColumn:withEvent:offset:';
-    function browser_validateDrop_proposedRow_column_dropOperation(browser: NSBrowser; info: id; row: NSIntegerPtr; column: NSIntegerPtr; dropOperation: NSBrowserDropOperationPtr): NSDragOperation; message 'browser:validateDrop:proposedRow:column:dropOperation:';
-    function browser_acceptDrop_atRow_column_dropOperation(browser: NSBrowser; info: id; row: NSInteger; column: NSInteger; dropOperation: NSBrowserDropOperation): Boolean; message 'browser:acceptDrop:atRow:column:dropOperation:';
+    function browser_validateDrop_proposedRow_column_dropOperation(browser: NSBrowser; info: NSDraggingInfoProtocol; row: NSIntegerPtr; column: NSIntegerPtr; dropOperation: NSBrowserDropOperationPtr): NSDragOperation; message 'browser:validateDrop:proposedRow:column:dropOperation:';
+    function browser_acceptDrop_atRow_column_dropOperation(browser: NSBrowser; info: NSDraggingInfoProtocol; row: NSInteger; column: NSInteger; dropOperation: NSBrowserDropOperation): Boolean; message 'browser:acceptDrop:atRow:column:dropOperation:';
     function browser_typeSelectStringForRow_inColumn(browser: NSBrowser; row: NSInteger; column: NSInteger): NSString; message 'browser:typeSelectStringForRow:inColumn:';
     function browser_shouldTypeSelectForEvent_withCurrentSearchString(browser: NSBrowser; event: NSEvent; searchString: NSString): Boolean; message 'browser:shouldTypeSelectForEvent:withCurrentSearchString:';
     function browser_nextTypeSelectMatchFromRow_toRow_inColumn_forString(browser: NSBrowser; startRow: NSInteger; endRow: NSInteger; column: NSInteger; searchString: NSString): NSInteger; message 'browser:nextTypeSelectMatchFromRow:toRow:inColumn:forString:';

packages/cocoaint/src/appkit/NSBrowserCell.inc

@@ -1,6 +1,4 @@
 { Parsed from Appkit.framework NSBrowserCell.h }
-{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
-
 
 {$ifdef TYPES}
 {$ifndef NSBROWSERCELL_PAS_T}

packages/cocoaint/src/appkit/NSButton.inc

@@ -1,6 +1,4 @@
 { Parsed from Appkit.framework NSButton.h }
-{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
-
 
 {$ifdef TYPES}
 {$ifndef NSBUTTON_PAS_T}
@@ -72,7 +70,7 @@
     function performKeyEquivalent(key: NSEvent): Boolean; message 'performKeyEquivalent:';
 
     { Adopted Protocols }
-    function validateUserInterfaceItem(anItem: id): Boolean;
+    function validateUserInterfaceItem(anItem: NSValidatedUserInterfaceItemProtocol): Boolean;
   end;
 
 { NSKeyboardUI_NSButtonCategory }

packages/cocoaint/src/appkit/NSButtonCell.inc

@@ -1,6 +1,4 @@
 { Parsed from Appkit.framework NSButtonCell.h }
-{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
-
 
 {$ifdef TYPES}
 {$ifndef NSBUTTONCELL_PAS_T}

packages/cocoaint/src/appkit/NSCIImageRep.inc

@@ -1,6 +1,4 @@
 { Parsed from Appkit.framework NSCIImageRep.h }
-{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
-
 
 {$ifdef TYPES}
 {$ifndef NSCIIMAGEREP_PAS_T}

packages/cocoaint/src/appkit/NSCachedImageRep.inc

@@ -1,6 +1,4 @@
 { Parsed from Appkit.framework NSCachedImageRep.h }
-{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
-
 
 {$ifdef TYPES}
 {$ifndef NSCACHEDIMAGEREP_PAS_T}
@@ -49,10 +47,10 @@
     _cache: Pointer; {garbage collector: __strong }
     
   public
-    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';
+    function initWithWindow_rect(win: NSWindow; rect_: NSRect): id; message 'initWithWindow:rect:'; deprecated 'in Mac OS X 10.6 and later';
+    function initWithSize_depth_separate_alpha(size_: NSSize; depth: NSWindowDepth; flag: Boolean; alpha: Boolean): id; message 'initWithSize:depth:separate:alpha:'; deprecated 'in Mac OS X 10.6 and later';
+    function window: NSWindow; message 'window'; deprecated 'in Mac OS X 10.6 and later';
+    function rect: NSRect; message 'rect'; deprecated 'in Mac OS X 10.6 and later';
   end;
 
 {$endif}

packages/cocoaint/src/appkit/NSCell.inc

@@ -1,6 +1,4 @@
 { Parsed from Appkit.framework NSCell.h }
-{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
-
 
 {$ifdef TYPES}
 {$ifndef NSCELL_PAS_T}
@@ -273,7 +271,7 @@ var
     procedure setFormatter(newFormatter: NSFormatter); message 'setFormatter:';
     function formatter: id; message 'formatter';
     function objectValue: id; message 'objectValue';
-    procedure setObjectValue(obj: id); message 'setObjectValue:';
+    procedure setObjectValue(obj: NSCopyingProtocol); message 'setObjectValue:';
     function hasValidObjectValue: Boolean; message 'hasValidObjectValue';
     function stringValue: NSString; message 'stringValue';
     procedure setStringValue(aString: NSString); message 'setStringValue:';

packages/cocoaint/src/appkit/NSClipView.inc

@@ -1,6 +1,4 @@
 { Parsed from Appkit.framework NSClipView.h }
-{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
-
 
 {$ifdef TYPES}
 {$ifndef NSCLIPVIEW_PAS_T}

packages/cocoaint/src/appkit/NSCollectionView.inc

@@ -1,6 +1,4 @@
 { Parsed from Appkit.framework NSCollectionView.h }
-{ Version: 2.1.4 - Sun Jan 2 15:08:20 CET 2011 }
-
 
 {$ifdef TYPES}
 {$ifndef NSCOLLECTIONVIEW_PAS_T}
@@ -135,8 +133,8 @@ const
         _reserved: array[0..15] of Pointer;
     
   public
-    procedure setDelegate(aDelegate: id); message 'setDelegate:';
-    function delegate: id; message 'delegate';
+    procedure setDelegate(aDelegate: NSCollectionViewDelegateProtocol); message 'setDelegate:';
+    function delegate: NSCollectionViewDelegateProtocol; message 'delegate';
     function isFirstResponder: Boolean; message 'isFirstResponder';
     procedure setContent(content_: NSArray); message 'setContent:';
     function content: NSArray; message 'content';
@@ -173,12 +171,13 @@ const
   
 { NSCollectionViewDelegate Protocol }
   NSCollectionViewDelegateProtocol = objcprotocol external name 'NSCollectionViewDelegate'
+  optional
     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:';
+    function collectionView_validateDrop_proposedIndex_dropOperation(collectionView: NSCollectionView; draggingInfo: NSDraggingInfoProtocol; proposedDropIndex: NSIntegerPtr; proposedDropOperation: NSCollectionViewDropOperationPtr): NSDragOperation; message 'collectionView:validateDrop:proposedIndex:dropOperation:';
+    function collectionView_acceptDrop_index_dropOperation(collectionView: NSCollectionView; draggingInfo: NSDraggingInfoProtocol; index: NSInteger; dropOperation: NSCollectionViewDropOperation): Boolean; message 'collectionView:acceptDrop:index:dropOperation:';
   end;
 {$endif}
 {$endif}

packages/cocoaint/src/appkit/NSColor.inc

@@ -1,6 +1,4 @@
 { Parsed from Appkit.framework NSColor.h }
-{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
-
 
 {$ifdef TYPES}
 {$ifndef NSCOLOR_PAS_T}

packages/cocoaint/src/appkit/NSColorList.inc

@@ -1,6 +1,4 @@
 { Parsed from Appkit.framework NSColorList.h }
-{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
-
 
 {$ifdef TYPES}
 {$ifndef NSCOLORLIST_PAS_T}

packages/cocoaint/src/appkit/NSColorPanel.inc

@@ -1,6 +1,4 @@
 { Parsed from Appkit.framework NSColorPanel.h }
-{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
-
 
 {$ifdef TYPES}
 {$ifndef NSCOLORPANEL_PAS_T}

packages/cocoaint/src/appkit/NSColorPicker.inc

@@ -1,6 +1,4 @@
 { Parsed from Appkit.framework NSColorPicker.h }
-{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
-
 
 {$ifdef TYPES}
 {$ifndef NSCOLORPICKER_PAS_T}

packages/cocoaint/src/appkit/NSColorPicking.inc

@@ -1,6 +1,4 @@
 { Parsed from Appkit.framework NSColorPicking.h }
-{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
-
 
 {$ifdef TYPES}
 {$ifndef NSCOLORPICKING_PAS_T}

packages/cocoaint/src/appkit/NSColorSpace.inc

@@ -1,6 +1,4 @@
 { Parsed from Appkit.framework NSColorSpace.h }
-{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
-
 
 {$ifdef TYPES}
 {$ifndef NSCOLORSPACE_PAS_T}
@@ -83,7 +81,7 @@ type
     function ICCProfileData: NSData; message 'ICCProfileData';
     function initWithColorSyncProfile(prof: Pointer): id; message 'initWithColorSyncProfile:';
     function colorSyncProfile: Pointer; message 'colorSyncProfile';
-    function initWithCGColorSpace(cgColorSpace: CGColorSpaceRef): id; message 'initWithCGColorSpace:';
+    function initWithCGColorSpace(cgColorSpace_: CGColorSpaceRef): id; message 'initWithCGColorSpace:';
     function CGColorSpace: CGColorSpaceRef; message 'CGColorSpace';
     function numberOfColorComponents: NSInteger; message 'numberOfColorComponents';
     function colorSpaceModel: NSColorSpaceModel; message 'colorSpaceModel';

packages/cocoaint/src/appkit/NSColorWell.inc

@@ -1,6 +1,4 @@
 { Parsed from Appkit.framework NSColorWell.h }
-{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
-
 
 {$ifdef TYPES}
 {$ifndef NSCOLORWELL_PAS_T}

packages/cocoaint/src/appkit/NSComboBox.inc

@@ -1,6 +1,4 @@
 { Parsed from Appkit.framework NSComboBox.h }
-{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
-
 
 {$ifdef TYPES}
 {$ifndef NSCOMBOBOX_PAS_T}
@@ -78,10 +76,10 @@ var
     function numberOfItems: NSInteger; message 'numberOfItems';
     function completes: Boolean; message 'completes';
     procedure setCompletes(completes_: Boolean); message 'setCompletes:';
-    function delegate: id; message 'delegate';
-    procedure setDelegate(anObject: id); message 'setDelegate:';
-    function dataSource: id; message 'dataSource';
-    procedure setDataSource(aSource: id); message 'setDataSource:';
+    function delegate: NSComboBoxDelegateProtocol; message 'delegate';
+    procedure setDelegate(anObject: NSComboBoxDelegateProtocol); message 'setDelegate:';
+    function dataSource: NSComboBoxDataSourceProtocol; message 'dataSource';
+    procedure setDataSource(aSource: NSComboBoxDataSourceProtocol); message 'setDataSource:';
     procedure addItemWithObjectValue(object_: id); message 'addItemWithObjectValue:';
     procedure addItemsWithObjectValues(objects: NSArray); message 'addItemsWithObjectValues:';
     procedure insertItemWithObjectValue_atIndex(object_: id; index: NSInteger); message 'insertItemWithObjectValue:atIndex:';
@@ -103,6 +101,7 @@ var
   
 { NSComboBoxDataSource Protocol }
   NSComboBoxDataSourceProtocol = objcprotocol external name 'NSComboBoxDataSource'
+  optional
     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:';
@@ -111,6 +110,7 @@ var
   
 { NSComboBoxDelegate Protocol }
   NSComboBoxDelegateProtocol = objcprotocol external name 'NSComboBoxDelegate'
+  optional
     procedure comboBoxWillPopUp(notification: NSNotification); message 'comboBoxWillPopUp:';
     procedure comboBoxWillDismiss(notification: NSNotification); message 'comboBoxWillDismiss:';
     procedure comboBoxSelectionDidChange(notification: NSNotification); message 'comboBoxSelectionDidChange:';

packages/cocoaint/src/appkit/NSComboBoxCell.inc

@@ -1,6 +1,4 @@
 { Parsed from Appkit.framework NSComboBoxCell.h }
-{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
-
 
 {$ifdef TYPES}
 {$ifndef NSCOMBOBOXCELL_PAS_T}
@@ -81,6 +79,7 @@
   
 { NSComboBoxCellDataSource Protocol }
   NSComboBoxCellDataSourceProtocol = objcprotocol external name 'NSComboBoxCellDataSource'
+  optional
     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:';

packages/cocoaint/src/appkit/NSControl.inc

@@ -1,6 +1,4 @@
 { Parsed from Appkit.framework NSControl.h }
-{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
-
 
 {$ifdef TYPES}
 {$ifndef NSCONTROL_PAS_T}
@@ -96,7 +94,7 @@ var
     procedure setFont(fontObj: NSFont); message 'setFont:';
     procedure setFormatter(newFormatter: NSFormatter); message 'setFormatter:';
     function formatter: id; message 'formatter';
-    procedure setObjectValue(obj: id); message 'setObjectValue:';
+    procedure setObjectValue(obj: NSCopyingProtocol); message 'setObjectValue:';
     procedure setStringValue(aString: NSString); message 'setStringValue:';
     procedure setIntValue(anInt: cint); message 'setIntValue:';
     procedure setFloatValue(aFloat: single); message 'setFloatValue:';
@@ -162,6 +160,7 @@ var
   
 { NSControlTextEditingDelegate Protocol }
   NSControlTextEditingDelegateProtocol = objcprotocol external name 'NSControlTextEditingDelegate'
+  optional
     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:';

packages/cocoaint/src/appkit/NSController.inc

@@ -1,6 +1,4 @@
 { Parsed from Appkit.framework NSController.h }
-{ Version: 2.1.4 - Sun Jan 2 15:08:20 CET 2011 }
-
 
 {$ifdef TYPES}
 {$ifndef NSCONTROLLER_PAS_T}

packages/cocoaint/src/appkit/NSCursor.inc

@@ -1,6 +1,4 @@
 { Parsed from Appkit.framework NSCursor.h }
-{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
-
 
 {$ifdef TYPES}
 {$ifndef NSCURSOR_PAS_T}

packages/cocoaint/src/appkit/NSCustomImageRep.inc

@@ -1,6 +1,4 @@
 { Parsed from Appkit.framework NSCustomImageRep.h }
-{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
-
 
 {$ifdef TYPES}
 {$ifndef NSCUSTOMIMAGEREP_PAS_T}

packages/cocoaint/src/appkit/NSDatePicker.inc

@@ -1,6 +1,4 @@
 { Parsed from Appkit.framework NSDatePicker.h }
-{ Version: 2.1.4 - Sun Jan 2 15:08:20 CET 2011 }
-
 
 {$ifdef TYPES}
 {$ifndef NSDATEPICKER_PAS_T}
@@ -75,8 +73,8 @@
     procedure setMinDate(date: NSDate); message 'setMinDate:';
     function maxDate: NSDate; message 'maxDate';
     procedure setMaxDate(date: NSDate); message 'setMaxDate:';
-    function delegate: id; message 'delegate';
-    procedure setDelegate(anObject: id); message 'setDelegate:';
+    function delegate: NSDatePickerCellDelegateProtocol; message 'delegate';
+    procedure setDelegate(anObject: NSDatePickerCellDelegateProtocol); message 'setDelegate:';
   end;
 
 {$endif}

packages/cocoaint/src/appkit/NSDatePickerCell.inc

@@ -1,6 +1,4 @@
 { Parsed from Appkit.framework NSDatePickerCell.h }
-{ Version: 2.1.4 - Sun Jan 2 15:08:20 CET 2011 }
-
 
 {$ifdef TYPES}
 {$ifndef NSDATEPICKERCELL_PAS_T}
@@ -131,8 +129,8 @@ type
     procedure setMinDate(date: NSDate); message 'setMinDate:';
     function maxDate: NSDate; message 'maxDate';
     procedure setMaxDate(date: NSDate); message 'setMaxDate:';
-    function delegate: id; message 'delegate';
-    procedure setDelegate(anObject: id); message 'setDelegate:';
+    function delegate: NSDatePickerCellDelegateProtocol; message 'delegate';
+    procedure setDelegate(anObject: NSDatePickerCellDelegateProtocol); message 'setDelegate:';
   end;
 
 {$endif}
@@ -143,6 +141,7 @@ type
   
 { NSDatePickerCellDelegate Protocol }
   NSDatePickerCellDelegateProtocol = objcprotocol external name 'NSDatePickerCellDelegate'
+  optional
     procedure datePickerCell_validateProposedDateValue_timeInterval(aDatePickerCell: NSDatePickerCell; proposedDateValue: NSDatePointer; proposedTimeInterval: NSTimeIntervalPtr); message 'datePickerCell:validateProposedDateValue:timeInterval:';
   end;
 {$endif}

packages/cocoaint/src/appkit/NSDictionaryController.inc

@@ -1,6 +1,4 @@
 { Parsed from Appkit.framework NSDictionaryController.h }
-{ Version: 2.1.4 - Sun Jan 2 15:08:20 CET 2011 }
-
 
 {$ifdef TYPES}
 {$ifndef NSDICTIONARYCONTROLLER_PAS_T}

packages/cocoaint/src/appkit/NSDockTile.inc

@@ -1,6 +1,4 @@
 { Parsed from Appkit.framework NSDockTile.h }
-{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
-
 
 {$ifdef TYPES}
 {$ifndef NSDOCKTILE_PAS_T}
@@ -86,7 +84,9 @@ const
   
 { NSDockTilePlugIn Protocol }
   NSDockTilePlugInProtocol = objcprotocol external name 'NSDockTilePlugIn'
+  required
     procedure setDockTile(dockTile: NSDockTile); message 'setDockTile:';
+  optional
     function dockMenu: NSMenu; message 'dockMenu';
   end;
 {$endif}

packages/cocoaint/src/appkit/NSDocument.inc

@@ -1,6 +1,4 @@
 { Parsed from Appkit.framework NSDocument.h }
-{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
-
 
 {$ifdef TYPES}
 {$ifndef NSDOCUMENT_PAS_T}
@@ -173,7 +171,7 @@ type
     class function isNativeType(type_: NSString): Boolean; message 'isNativeType:';
     function writableTypesForSaveOperation(saveOperation: NSSaveOperationType): NSArray; message 'writableTypesForSaveOperation:';
     function fileNameExtensionForType_saveOperation(typeName: NSString; saveOperation: NSSaveOperationType): NSString; message 'fileNameExtensionForType:saveOperation:';
-    function validateUserInterfaceItem(anItem: id): Boolean; message 'validateUserInterfaceItem:';
+    function validateUserInterfaceItem(anItem: NSValidatedUserInterfaceItemProtocol): Boolean; message 'validateUserInterfaceItem:';
 
     { Adopted Protocols }
   end;
@@ -181,7 +179,7 @@ type
 { NSDeprecated_NSDocumentCategory }
   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 fileAttributesToWriteToFile_ofType_saveOperation(fullDocumentPath: NSString; documentTypeName: NSString; saveOperationType: NSSaveOperationType): NSDictionary; message 'fileAttributesToWriteToFile:ofType:saveOperation:'; deprecated 'in Mac OS X 10.4 and later';
     function fileName: NSString; message 'fileName'; deprecated 'in Mac OS X 10.4 and later';
     function fileWrapperRepresentationOfType(type_: NSString): NSFileWrapper; message 'fileWrapperRepresentationOfType:'; deprecated 'in Mac OS X 10.4 and later';
     function initWithContentsOfFile_ofType(absolutePath: NSString; typeName: NSString): id; message 'initWithContentsOfFile:ofType:'; deprecated 'in Mac OS X 10.4 and later';

packages/cocoaint/src/appkit/NSDocumentController.inc

@@ -1,6 +1,4 @@
 { Parsed from Appkit.framework NSDocumentController.h }
-{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
-
 
 {$ifdef TYPES}
 {$ifndef NSDOCUMENTCONTROLLER_PAS_T}
@@ -70,7 +68,7 @@
     function makeDocumentWithContentsOfURL_ofType_error(absoluteURL: NSURL; typeName: NSString; outError: NSErrorPointer): id; message 'makeDocumentWithContentsOfURL:ofType:error:';
     function reopenDocumentForURL_withContentsOfURL_error(absoluteDocumentURL: NSURL; absoluteDocumentContentsURL: NSURL; outError: NSErrorPointer): Boolean; message 'reopenDocumentForURL:withContentsOfURL:error:';
     function makeDocumentForURL_withContentsOfURL_ofType_error(absoluteDocumentURL: NSURL; absoluteDocumentContentsURL: NSURL; typeName: NSString; outError: NSErrorPointer): id; message 'makeDocumentForURL:withContentsOfURL:ofType:error:';
-    procedure setAutosavingDelay(autosavingDelay: NSTimeInterval); message 'setAutosavingDelay:';
+    procedure setAutosavingDelay(autosavingDelay_: NSTimeInterval); message 'setAutosavingDelay:';
     function autosavingDelay: NSTimeInterval; message 'autosavingDelay';
     procedure saveAllDocuments(sender: id); message 'saveAllDocuments:';
     function hasEditedDocuments: Boolean; message 'hasEditedDocuments';
@@ -89,7 +87,7 @@
     function documentClassNames: NSArray; message 'documentClassNames';
     function documentClassForType(typeName: NSString): Pobjc_class; message 'documentClassForType:';
     function displayNameForType(typeName: NSString): NSString; message 'displayNameForType:';
-    function validateUserInterfaceItem(anItem: id): Boolean; message 'validateUserInterfaceItem:';
+    function validateUserInterfaceItem(anItem: NSValidatedUserInterfaceItemProtocol): Boolean; message 'validateUserInterfaceItem:';
 
     { Adopted Protocols }
     procedure encodeWithCoder(aCoder: NSCoder);

packages/cocoaint/src/appkit/NSDocumentScripting.inc

@@ -1,6 +1,4 @@
 { Parsed from Appkit.framework NSDocumentScripting.h }
-{ Version: 2.1.4 - Sun Jan 2 15:08:20 CET 2011 }
-
 
 {$ifdef TYPES}
 {$ifndef NSDOCUMENTSCRIPTING_PAS_T}

packages/cocoaint/src/appkit/NSDragging.inc

@@ -1,6 +1,4 @@
 { Parsed from Appkit.framework NSDragging.h }
-{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
-
 
 {$ifdef TYPES}
 {$ifndef NSDRAGGING_PAS_T}
@@ -59,13 +57,13 @@ const
 
 { NSDraggingDestinationCategory }
   NSDraggingDestinationCategory = objccategory external (NSObject)
-    function draggingEntered(sender: id): NSDragOperation; message 'draggingEntered:';
-    function draggingUpdated(sender: id): NSDragOperation; message 'draggingUpdated:';
-    procedure draggingExited(sender: id); message 'draggingExited:';
-    function prepareForDragOperation(sender: id): Boolean; message 'prepareForDragOperation:';
-    function performDragOperation(sender: id): Boolean; message 'performDragOperation:';
-    procedure concludeDragOperation(sender: id); message 'concludeDragOperation:';
-    procedure draggingEnded(sender: id); message 'draggingEnded:';
+    function draggingEntered(sender: NSDraggingInfoProtocol): NSDragOperation; message 'draggingEntered:';
+    function draggingUpdated(sender: NSDraggingInfoProtocol): NSDragOperation; message 'draggingUpdated:';
+    procedure draggingExited(sender: NSDraggingInfoProtocol); message 'draggingExited:';
+    function prepareForDragOperation(sender: NSDraggingInfoProtocol): Boolean; message 'prepareForDragOperation:';
+    function performDragOperation(sender: NSDraggingInfoProtocol): Boolean; message 'performDragOperation:';
+    procedure concludeDragOperation(sender: NSDraggingInfoProtocol); message 'concludeDragOperation:';
+    procedure draggingEnded(sender: NSDraggingInfoProtocol); message 'draggingEnded:';
     function wantsPeriodicDraggingUpdates: Boolean; message 'wantsPeriodicDraggingUpdates';
   end;
 

packages/cocoaint/src/appkit/NSDrawer.inc

@@ -1,6 +1,4 @@
 { Parsed from Appkit.framework NSDrawer.h }
-{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
-
 
 {$ifdef TYPES}
 {$ifndef NSDRAWER_PAS_T}
@@ -95,8 +93,8 @@ var
     function contentView: NSView; message 'contentView';
     procedure setPreferredEdge(edge_: NSRectEdge); message 'setPreferredEdge:';
     function preferredEdge: NSRectEdge; message 'preferredEdge';
-    procedure setDelegate(anObject: id); message 'setDelegate:';
-    function delegate: id; message 'delegate';
+    procedure setDelegate(anObject: NSDrawerDelegateProtocol); message 'setDelegate:';
+    function delegate: NSDrawerDelegateProtocol; message 'delegate';
     procedure open; message 'open';
     procedure openOnEdge(edge_: NSRectEdge); message 'openOnEdge:';
     procedure close; message 'close';
@@ -128,6 +126,7 @@ var
   
 { NSDrawerDelegate Protocol }
   NSDrawerDelegateProtocol = objcprotocol external name 'NSDrawerDelegate'
+  optional
     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:';

packages/cocoaint/src/appkit/NSEPSImageRep.inc

@@ -1,6 +1,4 @@
 { Parsed from Appkit.framework NSEPSImageRep.h }
-{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
-
 
 {$ifdef TYPES}
 {$ifndef NSEPSIMAGEREP_PAS_T}

packages/cocoaint/src/appkit/NSErrors.inc

@@ -1,6 +1,4 @@
 { Parsed from Appkit.framework NSErrors.h }
-{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
-
 
 {$ifdef TYPES}
 {$ifndef NSERRORS_PAS_T}

packages/cocoaint/src/appkit/NSEvent.inc

@@ -1,6 +1,4 @@
 { Parsed from Appkit.framework NSEvent.h }
-{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
-
 
 {$ifdef TYPES}
 {$ifndef NSEVENT_PAS_T}

packages/cocoaint/src/appkit/NSFileWrapper.inc

@@ -1,6 +1,4 @@
 { Parsed from Appkit.framework NSFileWrapper.h }
-{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
-
 
 {$ifdef TYPES}
 {$ifndef NSFILEWRAPPER_PAS_T}

packages/cocoaint/src/appkit/NSFont.inc

@@ -1,6 +1,4 @@
 { Parsed from Appkit.framework NSFont.h }
-{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
-
 
 {$ifdef TYPES}
 {$ifndef NSFONT_PAS_T}
@@ -71,23 +69,23 @@ function NSConvertGlyphsToPackedGlyphs(glBuf: NSGlyphPtr; count: NSInteger; pack
 var
   NSAntialiasThresholdChangedNotification: NSString; cvar; external;
   NSFontSetChangedNotification: NSString; cvar; external;
-  NSAFMFamilyName: NSString; cvar; external;
-  NSAFMFontName: NSString; cvar; external;
-  NSAFMFormatVersion: NSString; cvar; external;
-  NSAFMFullName: NSString; cvar; external;
-  NSAFMNotice: NSString; cvar; external;
-  NSAFMVersion: NSString; cvar; external;
-  NSAFMWeight: NSString; cvar; external;
-  NSAFMEncodingScheme: NSString; cvar; external;
-  NSAFMCharacterSet: NSString; cvar; external;
-  NSAFMCapHeight: NSString; cvar; external;
-  NSAFMXHeight: NSString; cvar; external;
-  NSAFMAscender: NSString; cvar; external;
-  NSAFMDescender: NSString; cvar; external;
-  NSAFMUnderlinePosition: NSString; cvar; external;
-  NSAFMUnderlineThickness: NSString; cvar; external;
-  NSAFMItalicAngle: NSString; cvar; external;
-  NSAFMMappingScheme: NSString; cvar; external;
+  NSAFMFamilyName: NSString deprecated 'in Mac OS X 10.4 and later'; cvar; external;
+  NSAFMFontName: NSString deprecated 'in Mac OS X 10.4 and later'; cvar; external;
+  NSAFMFormatVersion: NSString deprecated 'in Mac OS X 10.4 and later'; cvar; external;
+  NSAFMFullName: NSString deprecated 'in Mac OS X 10.4 and later'; cvar; external;
+  NSAFMNotice: NSString deprecated 'in Mac OS X 10.4 and later'; cvar; external;
+  NSAFMVersion: NSString deprecated 'in Mac OS X 10.4 and later'; cvar; external;
+  NSAFMWeight: NSString deprecated 'in Mac OS X 10.4 and later'; cvar; external;
+  NSAFMEncodingScheme: NSString deprecated 'in Mac OS X 10.4 and later'; cvar; external;
+  NSAFMCharacterSet: NSString deprecated 'in Mac OS X 10.4 and later'; cvar; external;
+  NSAFMCapHeight: NSString deprecated 'in Mac OS X 10.4 and later'; cvar; external;
+  NSAFMXHeight: NSString deprecated 'in Mac OS X 10.4 and later'; cvar; external;
+  NSAFMAscender: NSString deprecated 'in Mac OS X 10.4 and later'; cvar; external;
+  NSAFMDescender: NSString deprecated 'in Mac OS X 10.4 and later'; cvar; external;
+  NSAFMUnderlinePosition: NSString deprecated 'in Mac OS X 10.4 and later'; cvar; external;
+  NSAFMUnderlineThickness: NSString deprecated 'in Mac OS X 10.4 and later'; cvar; external;
+  NSAFMItalicAngle: NSString deprecated 'in Mac OS X 10.4 and later'; cvar; external;
+  NSAFMMappingScheme: NSString deprecated 'in Mac OS X 10.4 and later'; cvar; external;
 
 {$endif}
 {$endif}

packages/cocoaint/src/appkit/NSFontDescriptor.inc

@@ -1,6 +1,4 @@
 { Parsed from Appkit.framework NSFontDescriptor.h }
-{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
-
 
 {$ifdef TYPES}
 {$ifndef NSFONTDESCRIPTOR_PAS_T}
@@ -75,7 +73,7 @@ var
   NSFontTraitsAttribute: NSString; cvar; external;
   NSFontFixedAdvanceAttribute: NSString; cvar; external;
   NSFontFeatureSettingsAttribute: NSString; cvar; external;
-  NSFontColorAttribute: NSString; cvar; external;
+  NSFontColorAttribute: NSString deprecated 'in Mac OS X 10.4 and later'; cvar; external;
   NSFontSymbolicTrait: NSString; cvar; external;
   NSFontWeightTrait: NSString; cvar; external;
   NSFontWidthTrait: NSString; cvar; external;

packages/cocoaint/src/appkit/NSFontManager.inc

@@ -1,6 +1,4 @@
 { Parsed from Appkit.framework NSFontManager.h }
-{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
-
 
 {$ifdef TYPES}
 {$ifndef NSFONTMANAGER_PAS_T}

packages/cocoaint/src/appkit/NSFontPanel.inc

@@ -1,6 +1,4 @@
 { Parsed from Appkit.framework NSFontPanel.h }
-{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
-
 
 {$ifdef TYPES}
 {$ifndef NSFONTPANEL_PAS_T}

packages/cocoaint/src/appkit/NSForm.inc

@@ -1,6 +1,4 @@
 { Parsed from Appkit.framework NSForm.h }
-{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
-
 
 {$ifdef TYPES}
 {$ifndef NSFORM_PAS_T}

packages/cocoaint/src/appkit/NSFormCell.inc

@@ -1,6 +1,4 @@
 { Parsed from Appkit.framework NSFormCell.h }
-{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
-
 
 {$ifdef TYPES}
 {$ifndef NSFORMCELL_PAS_T}

packages/cocoaint/src/appkit/NSGlyphGenerator.inc

@@ -1,6 +1,4 @@
 { Parsed from Appkit.framework NSGlyphGenerator.h }
-{ Version: 2.1.4 - Sun Jan 2 15:08:20 CET 2011 }
-
 
 {$ifdef TYPES}
 {$ifndef NSGLYPHGENERATOR_PAS_T}
@@ -53,7 +51,7 @@ const
   NSGlyphGenerator = objcclass external (NSObject)
     
   public
-    procedure generateGlyphsForGlyphStorage_desiredNumberOfCharacters_glyphIndex_characterIndex(glyphStorage: id; nChars: NSUInteger; glyphIndex: NSUIntegerPtr; charIndex: NSUIntegerPtr); message 'generateGlyphsForGlyphStorage:desiredNumberOfCharacters:glyphIndex:characterIndex:';
+    procedure generateGlyphsForGlyphStorage_desiredNumberOfCharacters_glyphIndex_characterIndex(glyphStorage: NSGlyphStorageProtocol; nChars: NSUInteger; glyphIndex: NSUIntegerPtr; charIndex: NSUIntegerPtr); message 'generateGlyphsForGlyphStorage:desiredNumberOfCharacters:glyphIndex:characterIndex:';
     class function sharedGlyphGenerator: id; message 'sharedGlyphGenerator';
   end;
 

packages/cocoaint/src/appkit/NSGlyphInfo.inc

@@ -1,6 +1,4 @@
 { Parsed from Appkit.framework NSGlyphInfo.h }
-{ Version: 2.1.4 - Sun Jan 2 15:08:20 CET 2011 }
-
 
 {$ifdef TYPES}
 {$ifndef NSGLYPHINFO_PAS_T}

packages/cocoaint/src/appkit/NSGradient.inc

@@ -1,6 +1,4 @@
 { Parsed from Appkit.framework NSGradient.h }
-{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
-
 
 {$ifdef TYPES}
 {$ifndef NSGRADIENT_PAS_T}

packages/cocoaint/src/appkit/NSGraphics.inc

@@ -1,6 +1,4 @@
 { Parsed from Appkit.framework NSGraphics.h }
-{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
-
 
 {$ifdef TYPES}
 {$ifndef NSGRAPHICS_PAS_T}
@@ -156,8 +154,8 @@ var
   NSNamedColorSpace: NSString; cvar; external;
   NSPatternColorSpace: NSString; cvar; external;
   NSCustomColorSpace: NSString; cvar; external;
-  NSCalibratedBlackColorSpace: NSString; cvar; external;
-  NSDeviceBlackColorSpace: NSString; cvar; external;
+  NSCalibratedBlackColorSpace: NSString deprecated 'in Mac OS X 10.6 and later'; cvar; external;
+  NSDeviceBlackColorSpace: NSString deprecated 'in Mac OS X 10.6 and later'; cvar; external;
   NSDeviceResolution: NSString; cvar; external;
   NSDeviceColorSpaceName: NSString; cvar; external;
   NSDeviceBitsPerSample: NSString; cvar; external;

packages/cocoaint/src/appkit/NSGraphicsContext.inc

@@ -1,6 +1,4 @@
 { Parsed from Appkit.framework NSGraphicsContext.h }
-{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
-
 
 {$ifdef TYPES}
 {$ifndef NSGRAPHICSCONTEXT_PAS_T}

packages/cocoaint/src/appkit/NSHelpManager.inc

@@ -1,6 +1,4 @@
 { Parsed from Appkit.framework NSHelpManager.h }
-{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
-
 
 {$ifdef TYPES}
 {$ifndef NSHELPMANAGER_PAS_T}

packages/cocoaint/src/appkit/NSImage.inc

@@ -1,6 +1,4 @@
 { Parsed from Appkit.framework NSImage.h }
-{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
-
 
 {$ifdef TYPES}
 {$ifndef NSIMAGE_PAS_T}
@@ -201,9 +199,9 @@ var
     procedure lockFocus; message 'lockFocus';
     procedure lockFocusFlipped(flipped: Boolean); message 'lockFocusFlipped:';
     procedure unlockFocus; message 'unlockFocus';
-    function bestRepresentationForDevice(deviceDescription: NSDictionary): NSImageRep; message 'bestRepresentationForDevice:';
-    procedure setDelegate(anObject: id); message 'setDelegate:';
-    function delegate: id; message 'delegate';
+    function bestRepresentationForDevice(deviceDescription: NSDictionary): NSImageRep; message 'bestRepresentationForDevice:'; deprecated 'in Mac OS X 10.6 and later';
+    procedure setDelegate(anObject: NSImageDelegateProtocol); message 'setDelegate:';
+    function delegate: NSImageDelegateProtocol; message 'delegate';
     class function imageUnfilteredFileTypes: NSArray; message 'imageUnfilteredFileTypes';
     class function imageUnfilteredPasteboardTypes: NSArray; message 'imageUnfilteredPasteboardTypes';
     class function imageFileTypes: NSArray; message 'imageFileTypes';
@@ -261,6 +259,7 @@ var
   
 { NSImageDelegate Protocol }
   NSImageDelegateProtocol = objcprotocol external name 'NSImageDelegate'
+  optional
     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:';

packages/cocoaint/src/appkit/NSImageCell.inc

@@ -1,6 +1,4 @@
 { Parsed from Appkit.framework NSImageCell.h }
-{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
-
 
 {$ifdef TYPES}
 {$ifndef NSIMAGECELL_PAS_T}

packages/cocoaint/src/appkit/NSImageRep.inc

@@ -1,6 +1,4 @@
 { Parsed from Appkit.framework NSImageRep.h }
-{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
-
 
 {$ifdef TYPES}
 {$ifndef NSIMAGEREP_PAS_T}

packages/cocoaint/src/appkit/NSImageView.inc

@@ -1,6 +1,4 @@
 { Parsed from Appkit.framework NSImageView.h }
-{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
-
 
 {$ifdef TYPES}
 {$ifndef NSIMAGEVIEW_PAS_T}

packages/cocoaint/src/appkit/NSInputManager.inc

@@ -1,6 +1,4 @@
 { Parsed from Appkit.framework NSInputManager.h }
-{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
-
 
 {$ifdef TYPES}
 {$ifndef NSINPUTMANAGER_PAS_T}

packages/cocoaint/src/appkit/NSInputServer.inc

@@ -1,6 +1,4 @@
 { Parsed from Appkit.framework NSInputServer.h }
-{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
-
 
 {$ifdef TYPES}
 {$ifndef NSINPUTSERVER_PAS_T}

packages/cocoaint/src/appkit/NSInterfaceStyle.inc

@@ -1,6 +1,4 @@
 { Parsed from Appkit.framework NSInterfaceStyle.h }
-{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
-
 
 {$ifdef TYPES}
 {$ifndef NSINTERFACESTYLE_PAS_T}

packages/cocoaint/src/appkit/NSKeyValueBinding.inc

@@ -1,6 +1,4 @@
 { Parsed from Appkit.framework NSKeyValueBinding.h }
-{ Version: 2.1.4 - Sun Jan 2 15:08:20 CET 2011 }
-
 
 {$ifdef TYPES}
 {$ifndef NSKEYVALUEBINDING_PAS_T}

packages/cocoaint/src/appkit/NSLayoutManager.inc

@@ -1,6 +1,4 @@
 { Parsed from Appkit.framework NSLayoutManager.h }
-{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
-
 
 {$ifdef TYPES}
 {$ifndef NSLAYOUTMANAGER_PAS_T}
@@ -164,8 +162,8 @@ type
     procedure setGlyphGenerator(glyphGenerator_: NSGlyphGenerator); message 'setGlyphGenerator:';
     function typesetter: NSTypesetter; message 'typesetter';
     procedure setTypesetter(typesetter_: NSTypesetter); message 'setTypesetter:';
-    function delegate: id; message 'delegate';
-    procedure setDelegate(delegate_: id); message 'setDelegate:';
+    function delegate: NSLayoutManagerDelegateProtocol; message 'delegate';
+    procedure setDelegate(delegate_: NSLayoutManagerDelegateProtocol); message 'setDelegate:';
     function textContainers: NSArray; message 'textContainers';
     procedure addTextContainer(container: NSTextContainer); message 'addTextContainer:';
     procedure insertTextContainer_atIndex(container: NSTextContainer; index: NSUInteger); message 'insertTextContainer:atIndex:';
@@ -309,6 +307,7 @@ type
   
 { NSLayoutManagerDelegate Protocol }
   NSLayoutManagerDelegateProtocol = objcprotocol external name 'NSLayoutManagerDelegate'
+  optional
     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:';

packages/cocoaint/src/appkit/NSLevelIndicator.inc

@@ -1,6 +1,4 @@
 { Parsed from Appkit.framework NSLevelIndicator.h }
-{ Version: 2.1.4 - Sun Jan 2 15:08:20 CET 2011 }
-
 
 {$ifdef TYPES}
 {$ifndef NSLEVELINDICATOR_PAS_T}

packages/cocoaint/src/appkit/NSLevelIndicatorCell.inc

@@ -1,6 +1,4 @@
 { Parsed from Appkit.framework NSLevelIndicatorCell.h }
-{ Version: 2.1.4 - Sun Jan 2 15:08:20 CET 2011 }
-
 
 {$ifdef TYPES}
 {$ifndef NSLEVELINDICATORCELL_PAS_T}

packages/cocoaint/src/appkit/NSMatrix.inc

@@ -1,6 +1,4 @@
 { Parsed from Appkit.framework NSMatrix.h }
-{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
-
 
 {$ifdef TYPES}
 {$ifndef NSMATRIX_PAS_T}
@@ -231,8 +229,8 @@ __MFlagsPtr = ^__MFlags;
     function performKeyEquivalent(theEvent: NSEvent): Boolean; message 'performKeyEquivalent:';
     function sendAction: Boolean; message 'sendAction';
     procedure sendDoubleAction; message 'sendDoubleAction';
-    function delegate: id; message 'delegate';
-    procedure setDelegate(anObject: id); message 'setDelegate:';
+    function delegate: NSMatrixDelegateProtocol; message 'delegate';
+    procedure setDelegate(anObject: NSMatrixDelegateProtocol); message 'setDelegate:';
     function textShouldBeginEditing(textObject: NSText): Boolean; message 'textShouldBeginEditing:';
     function textShouldEndEditing(textObject: NSText): Boolean; message 'textShouldEndEditing:';
     procedure textDidBeginEditing(notification: NSNotification); message 'textDidBeginEditing:';
@@ -246,7 +244,7 @@ __MFlagsPtr = ^__MFlags;
     function toolTipForCell(cell_: NSCell): NSString; message 'toolTipForCell:';
 
     { Adopted Protocols }
-    function validateUserInterfaceItem(anItem: id): Boolean;
+    function validateUserInterfaceItem(anItem: NSValidatedUserInterfaceItemProtocol): Boolean;
   end;
 
 { NSKeyboardUI_NSMatrixCategory }

packages/cocoaint/src/appkit/NSMenu.inc

@@ -1,6 +1,4 @@
 { Parsed from Appkit.framework NSMenu.h }
-{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
-
 
 {$ifdef TYPES}
 {$ifndef NSMENU_PAS_T}
@@ -103,7 +101,7 @@ var
     procedure setTitle(aString: NSString); message 'setTitle:';
     function title: NSString; message 'title';
     class procedure popUpContextMenu_withEvent_forView(menu: NSMenu; event: NSEvent; view: NSView); message 'popUpContextMenu:withEvent:forView:';
-    class procedure popUpContextMenu_withEvent_forView_withFont(menu: NSMenu; event: NSEvent; view: NSView; font: NSFont); message 'popUpContextMenu:withEvent:forView:withFont:';
+    class procedure popUpContextMenu_withEvent_forView_withFont(menu: NSMenu; event: NSEvent; view: NSView; font_: NSFont); message 'popUpContextMenu:withEvent:forView:withFont:';
     function popUpMenuPositioningItem_atLocation_inView(item: NSMenuItem; location: NSPoint; view: NSView): Boolean; message 'popUpMenuPositioningItem:atLocation:inView:';
     class procedure setMenuBarVisible(visible: Boolean); message 'setMenuBarVisible:';
     class function menuBarVisible: Boolean; message 'menuBarVisible';
@@ -132,8 +130,8 @@ var
     function performKeyEquivalent(theEvent: NSEvent): Boolean; message 'performKeyEquivalent:';
     procedure itemChanged(item: NSMenuItem); message 'itemChanged:';
     procedure performActionForItemAtIndex(index: NSInteger); message 'performActionForItemAtIndex:';
-    procedure setDelegate(anObject: id); message 'setDelegate:';
-    function delegate: id; message 'delegate';
+    procedure setDelegate(anObject: NSMenuDelegateProtocol); message 'setDelegate:';
+    function delegate: NSMenuDelegateProtocol; message 'delegate';
     function menuBarHeight: CGFloat; message 'menuBarHeight';
     procedure cancelTracking; message 'cancelTracking';
     procedure cancelTrackingWithoutAnimation; message 'cancelTrackingWithoutAnimation';
@@ -197,6 +195,7 @@ var
   
 { NSMenuDelegate Protocol }
   NSMenuDelegateProtocol = objcprotocol external name 'NSMenuDelegate'
+  optional
     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:';

packages/cocoaint/src/appkit/NSMenuItem.inc

@@ -1,6 +1,4 @@
 { Parsed from Appkit.framework NSMenuItem.h }
-{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
-
 
 {$ifdef TYPES}
 {$ifndef NSMENUITEM_PAS_T}

packages/cocoaint/src/appkit/NSMenuItemCell.inc

@@ -1,6 +1,4 @@
 { Parsed from Appkit.framework NSMenuItemCell.h }
-{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
-
 
 {$ifdef TYPES}
 {$ifndef NSMENUITEMCELL_PAS_T}

packages/cocoaint/src/appkit/NSMenuView.inc

@@ -1,6 +1,4 @@
 { Parsed from Appkit.framework NSMenuView.h }
-{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
-
 
 {$ifdef TYPES}
 {$ifndef NSMENUVIEW_PAS_T}

packages/cocoaint/src/appkit/NSMovie.inc

@@ -1,6 +1,4 @@
 { Parsed from Appkit.framework NSMovie.h }
-{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
-
 
 {$ifdef TYPES}
 {$ifndef NSMOVIE_PAS_T}
@@ -59,7 +57,7 @@
     
   public
     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 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';
     function QTMovie_: Pointer; message 'QTMovie'; deprecated 'in Mac OS X 10.5 and later';
     function URL: NSURL; message 'URL'; deprecated 'in Mac OS X 10.5 and later';

packages/cocoaint/src/appkit/NSMovieView.inc

@@ -1,6 +1,4 @@
 { Parsed from Appkit.framework NSMovieView.h }
-{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
-
 
 {$ifdef TYPES}
 {$ifndef NSMOVIEVIEW_PAS_T}
@@ -84,7 +82,7 @@ __MVFlagsPtr = ^__MVFlags;
     _fReserved3: culong;
     
   public
-    procedure setMovie(movie: NSMovie); message 'setMovie:'; deprecated 'in Mac OS X 10.5 and later';
+    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';
     function movieRect: NSRect; message 'movieRect'; deprecated 'in Mac OS X 10.5 and later';
@@ -96,9 +94,9 @@ __MVFlagsPtr = ^__MVFlags;
     procedure gotoEnd(sender: id); message 'gotoEnd:'; deprecated 'in Mac OS X 10.5 and later';
     procedure stepForward(sender: id); message 'stepForward:'; deprecated 'in Mac OS X 10.5 and later';
     procedure stepBack(sender: id); message 'stepBack:'; deprecated 'in Mac OS X 10.5 and later';
-    procedure setRate(rate: single); message 'setRate:'; deprecated 'in Mac OS X 10.5 and later';
+    procedure setRate(rate_: single); message 'setRate:'; deprecated 'in Mac OS X 10.5 and later';
     function rate: single; message 'rate'; deprecated 'in Mac OS X 10.5 and later';
-    procedure setVolume(volume: single); message 'setVolume:'; deprecated 'in Mac OS X 10.5 and later';
+    procedure setVolume(volume_: single); message 'setVolume:'; deprecated 'in Mac OS X 10.5 and later';
     function volume: single; message 'volume'; deprecated 'in Mac OS X 10.5 and later';
     procedure setMuted(mute: Boolean); message 'setMuted:'; deprecated 'in Mac OS X 10.5 and later';
     function isMuted: Boolean; message 'isMuted'; deprecated 'in Mac OS X 10.5 and later';
@@ -117,12 +115,12 @@ __MVFlagsPtr = ^__MVFlags;
     procedure cut(sender: id); message 'cut:'; deprecated 'in Mac OS X 10.5 and later';
     procedure copy_(sender: id); message 'copy:'; deprecated 'in Mac OS X 10.5 and later';
     procedure paste(sender: id); message 'paste:'; deprecated 'in Mac OS X 10.5 and later';
-    procedure delete(sender: id); message 'delete:';
+    procedure delete(sender: id); message 'delete:'; deprecated 'in Mac OS X 10.5 and later';
     procedure selectAll(sender: id); message 'selectAll:'; deprecated 'in Mac OS X 10.5 and later';
     procedure clear(sender: id); message 'clear:'; deprecated 'in Mac OS X 10.5 and later';
 
     { Adopted Protocols }
-    function validateUserInterfaceItem(anItem: id): Boolean;
+    function validateUserInterfaceItem(anItem: NSValidatedUserInterfaceItemProtocol): Boolean;
   end;
 
 {$endif}

packages/cocoaint/src/appkit/NSNib.inc

@@ -1,6 +1,4 @@
 { Parsed from Appkit.framework NSNib.h }
-{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
-
 
 {$ifdef TYPES}
 {$ifndef NSNIB_PAS_T}

packages/cocoaint/src/appkit/NSNibLoading.inc

@@ -1,6 +1,4 @@
 { Parsed from Appkit.framework NSNibLoading.h }
-{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
-
 
 {$ifdef TYPES}
 {$ifndef NSNIBLOADING_PAS_T}

packages/cocoaint/src/appkit/NSObjectController.inc

@@ -1,6 +1,4 @@
 { Parsed from Appkit.framework NSObjectController.h }
-{ Version: 2.1.4 - Sun Jan 2 15:08:20 CET 2011 }
-
 
 {$ifdef TYPES}
 {$ifndef NSOBJECTCONTROLLER_PAS_T}
@@ -87,7 +85,7 @@
     function canAdd: Boolean; message 'canAdd';
     procedure remove(sender: id); message 'remove:';
     function canRemove: Boolean; message 'canRemove';
-    function validateUserInterfaceItem(item: id): Boolean; message 'validateUserInterfaceItem:';
+    function validateUserInterfaceItem(item: NSValidatedUserInterfaceItemProtocol): Boolean; message 'validateUserInterfaceItem:';
   end;
 
 { NSManagedControllerCategory }

packages/cocoaint/src/appkit/NSOpenGL.inc

@@ -1,6 +1,4 @@
 { Parsed from Appkit.framework NSOpenGL.h }
-{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
-
 
 {$ifdef TYPES}
 {$ifndef NSOPENGL_PAS_T}

packages/cocoaint/src/appkit/NSOpenGLView.inc

@@ -1,6 +1,4 @@
 { Parsed from Appkit.framework NSOpenGLView.h }
-{ Version: 2.1.4 - Sun Jan 2 15:08:20 CET 2011 }
-
 
 {$ifdef TYPES}
 {$ifndef NSOPENGLVIEW_PAS_T}

packages/cocoaint/src/appkit/NSOpenPanel.inc

@@ -1,6 +1,4 @@
 { Parsed from Appkit.framework NSOpenPanel.h }
-{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
-
 
 {$ifdef TYPES}
 {$ifndef NSOPENPANEL_PAS_T}

packages/cocoaint/src/appkit/NSOutlineView.inc

@@ -1,6 +1,4 @@
 { Parsed from Appkit.framework NSOutlineView.h }
-{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
-
 
 {$ifdef TYPES}
 {$ifndef NSOUTLINEVIEW_PAS_T}
@@ -159,10 +157,10 @@ var
     _ovReserved: id;
     
   public
-    procedure setDelegate(anObject: id); message 'setDelegate:';
-    function delegate: id; message 'delegate';
-    procedure setDataSource(aSource: id); message 'setDataSource:';
-    function dataSource: id; message 'dataSource';
+    procedure setDelegate(anObject: NSOutlineViewDelegateProtocol); message 'setDelegate:';
+    function delegate: NSOutlineViewDelegateProtocol; message 'delegate';
+    procedure setDataSource(aSource: NSOutlineViewDataSourceProtocol); message 'setDataSource:';
+    function dataSource: NSOutlineViewDataSourceProtocol; message 'dataSource';
     procedure setOutlineTableColumn(outlineTableColumn_: NSTableColumn); message 'setOutlineTableColumn:';
     function outlineTableColumn: NSTableColumn; message 'outlineTableColumn';
     function isExpandable(item: id): Boolean; message 'isExpandable:';
@@ -211,6 +209,7 @@ var
   
 { NSOutlineViewDataSource Protocol }
   NSOutlineViewDataSourceProtocol = objcprotocol external name 'NSOutlineViewDataSource'
+  optional
     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:';
@@ -220,13 +219,14 @@ var
     function outlineView_persistentObjectForItem(outlineView: NSOutlineView; item: id): id; message 'outlineView:persistentObjectForItem:';
     procedure outlineView_sortDescriptorsDidChange(outlineView: NSOutlineView; oldDescriptors: NSArray); message 'outlineView:sortDescriptorsDidChange:';
     function outlineView_writeItems_toPasteboard(outlineView: NSOutlineView; items: NSArray; pasteboard: NSPasteboard): Boolean; message 'outlineView:writeItems:toPasteboard:';
-    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_validateDrop_proposedItem_proposedChildIndex(outlineView: NSOutlineView; info: NSDraggingInfoProtocol; item: id; index: NSInteger): NSDragOperation; message 'outlineView:validateDrop:proposedItem:proposedChildIndex:';
+    function outlineView_acceptDrop_item_childIndex(outlineView: NSOutlineView; info: NSDraggingInfoProtocol; 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;
   
 { NSOutlineViewDelegate Protocol }
   NSOutlineViewDelegateProtocol = objcprotocol external name 'NSOutlineViewDelegate'
+  optional
     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:';

packages/cocoaint/src/appkit/NSPDFImageRep.inc

@@ -1,6 +1,4 @@
 { Parsed from Appkit.framework NSPDFImageRep.h }
-{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
-
 
 {$ifdef TYPES}
 {$ifndef NSPDFIMAGEREP_PAS_T}

packages/cocoaint/src/appkit/NSPICTImageRep.inc

@@ -1,6 +1,4 @@
 { Parsed from Appkit.framework NSPICTImageRep.h }
-{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
-
 
 {$ifdef TYPES}
 {$ifndef NSPICTIMAGEREP_PAS_T}

packages/cocoaint/src/appkit/NSPageLayout.inc

@@ -1,6 +1,4 @@
 { Parsed from Appkit.framework NSPageLayout.h }
-{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
-
 
 {$ifdef TYPES}
 {$ifndef NSPAGELAYOUT_PAS_T}

packages/cocoaint/src/appkit/NSPanel.inc

@@ -1,6 +1,4 @@
 { Parsed from Appkit.framework NSPanel.h }
-{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
-
 
 {$ifdef TYPES}
 {$ifndef NSPANEL_PAS_T}

packages/cocoaint/src/appkit/NSParagraphStyle.inc

@@ -1,6 +1,4 @@
 { Parsed from Appkit.framework NSParagraphStyle.h }
-{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
-
 
 {$ifdef TYPES}
 {$ifndef NSPARAGRAPHSTYLE_PAS_T}

packages/cocoaint/src/appkit/NSPasteboard.inc

@@ -1,6 +1,4 @@
 { Parsed from Appkit.framework NSPasteboard.h }
-{ Version: 2.1.4 - Sun Jan 2 15:08:19 CET 2011 }
-
 
 {$ifdef TYPES}
 {$ifndef NSPASTEBOARD_PAS_T}
@@ -189,14 +187,19 @@ var
   
 { NSPasteboardWriting Protocol }
   NSPasteboardWritingProtocol = objcprotocol external name 'NSPasteboardWriting'
+  required
     function writableTypesForPasteboard(pasteboard: NSPasteboard): NSArray; message 'writableTypesForPasteboard:';
+  optional
     function writingOptionsForType_pasteboard(type_: NSString; pasteboard: NSPasteboard): NSPasteboardWritingOptions; message 'writingOptionsForType:pasteboard:';
+  required
     function pasteboardPropertyListForType(type_: NSString): id; message 'pasteboardPropertyListForType:';
   end;
   
 { NSPasteboardReading Protocol }
   NSPasteboardReadingProtocol = objcprotocol external name 'NSPasteboardReading'
+  required
     class function readableTypesForPasteboard(pasteboard: NSPasteboard): NSArray; message 'readableTypesForPasteboard:';
+  optional
     class function readingOptionsForType_pasteboard(type_: NSString; pasteboard: NSPasteboard): NSPasteboardReadingOptions; message 'readingOptionsForType:pasteboard:';
     function initWithPasteboardPropertyList_ofType(propertyList: id; type_: NSString): id; message 'initWithPasteboardPropertyList:ofType:';
   end;

packages/cocoaint/src/appkit/NSPasteboardItem.inc

@@ -1,6 +1,4 @@
 { Parsed from Appkit.framework NSPasteboardItem.h }
-{ Version: 2.1.4 - Sun Jan 2 15:08:20 CET 2011 }
-
 
 {$ifdef TYPES}
 {$ifndef NSPASTEBOARDITEM_PAS_T}
@@ -54,7 +52,7 @@
   public
     function types: NSArray; message 'types';
     function availableTypeFromArray(types_: NSArray): NSString; message 'availableTypeFromArray:';
-    function setDataProvider_forTypes(dataProvider: id; types_: NSArray): Boolean; message 'setDataProvider:forTypes:';
+    function setDataProvider_forTypes(dataProvider: NSPasteboardItemDataProviderProtocol; types_: NSArray): Boolean; message 'setDataProvider:forTypes:';
     function setData_forType(data: NSData; type_: NSString): Boolean; message 'setData:forType:';
     function setString_forType(string_: NSString; type_: NSString): Boolean; message 'setString:forType:';
     function setPropertyList_forType(propertyList: id; type_: NSString): Boolean; message 'setPropertyList:forType:';
@@ -79,7 +77,9 @@
   
 { NSPasteboardItemDataProvider Protocol }
   NSPasteboardItemDataProviderProtocol = objcprotocol external name 'NSPasteboardItemDataProvider'
+  required
     procedure pasteboard_item_provideDataForType(pasteboard: NSPasteboard; item: NSPasteboardItem; type_: NSString); message 'pasteboard:item:provideDataForType:';
+  optional
     procedure pasteboardFinishedWithDataProvider(pasteboard: NSPasteboard); message 'pasteboardFinishedWithDataProvider:';
   end;
 {$endif}