Adds NSTextView and NSColor to PasCocoa

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@673 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
sekelsenmat 2009-01-25 11:56:47 +00:00
parent 7ff4cc9473
commit 78930629dc
8 changed files with 3171 additions and 93 deletions

View File

@ -30,7 +30,7 @@
#import <AppKit/NSMatrix.h>}
{$include NSMenu.inc}
{$include NSMenuItem.inc}
{#import <AppKit/NSColor.h>
{$include NSColor.inc>
#import <AppKit/NSColorSpace.h>}
{$include NSBitmapImageRep.inc}
{#import <AppKit/NSBrowser.h>
@ -103,7 +103,7 @@
#import <AppKit/NSLayoutManager.h>
#import <AppKit/NSParagraphStyle.h>
#import <AppKit/NSTextStorage.h>}
//{$include NSTextView.inc}
{$include NSTextView.inc}
{#import <AppKit/NSTextContainer.h>
#import <AppKit/NSTextAttachment.h>
#import <AppKit/NSInputManager.h>

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -8,6 +8,7 @@ FRAMEWORK="/System/Library/Frameworks/AppKit.framework/Headers"
#./objcparser -ini=$DEFAULT_INI -ini=$APPKIT_INI $FRAMEWORK/NSBox.h > ../appkit/NSBox.inc
#./objcparser -ini=$DEFAULT_INI -ini=$APPKIT_INI $FRAMEWORK/NSButton.h > ../appkit/NSButton.inc
#./objcparser -ini=$DEFAULT_INI -ini=$APPKIT_INI $FRAMEWORK/NSControl.h > ../appkit/NSControl.inc
./objcparser -ini=$DEFAULT_INI -ini=$APPKIT_INI $FRAMEWORK/NSColor.h > ../appkit/NSColor.inc
#./objcparser -ini=$DEFAULT_INI -ini=$APPKIT_INI $FRAMEWORK/NSGraphics.h > ../appkit/NSGraphics.inc
#./objcparser -ini=$DEFAULT_INI -ini=$APPKIT_INI $FRAMEWORK/NSGraphicsContext.h > ../appkit/NSGraphicsContext.inc
#./objcparser -ini=$DEFAULT_INI -ini=$APPKIT_INI $FRAMEWORK/NSImage.h > ../appkit/NSImage.inc
@ -15,7 +16,7 @@ FRAMEWORK="/System/Library/Frameworks/AppKit.framework/Headers"
#./objcparser -ini=$DEFAULT_INI -ini=$APPKIT_INI $FRAMEWORK/NSMenu.h > ../appkit/NSMenu.inc
#./objcparser -ini=$DEFAULT_INI -ini=$APPKIT_INI $FRAMEWORK/NSMenuItem.h > ../appkit/NSMenuItem.inc
#./objcparser -ini=$DEFAULT_INI -ini=$APPKIT_INI $FRAMEWORK/NSNibDeclarations.h > ../appkit/NSNibDeclarations.inc
./objcparser -ini=$DEFAULT_INI -ini=$APPKIT_INI $FRAMEWORK/NSNibLoading.h > ../appkit/NSNibLoading.inc
#./objcparser -ini=$DEFAULT_INI -ini=$APPKIT_INI $FRAMEWORK/NSNibLoading.h > ../appkit/NSNibLoading.inc
#./objcparser -ini=$DEFAULT_INI -ini=$APPKIT_INI $FRAMEWORK/NSOpenPanel.h > ../appkit/NSOpenPanel.inc
#./objcparser -ini=$DEFAULT_INI -ini=$APPKIT_INI $FRAMEWORK/NSPanel.h > ../appkit/NSPanel.inc
#./objcparser -ini=$DEFAULT_INI -ini=$APPKIT_INI $FRAMEWORK/NSSavePanel.h > ../appkit/NSSavePanel.inc
@ -25,6 +26,7 @@ FRAMEWORK="/System/Library/Frameworks/AppKit.framework/Headers"
#./objcparser -ini=$DEFAULT_INI -ini=$APPKIT_INI $FRAMEWORK/NSText.h > ../appkit/NSText.inc
#./objcparser -ini=$DEFAULT_INI -ini=$APPKIT_INI $FRAMEWORK/NSTextField.h > ../appkit/NSTextField.inc
#./objcparser -ini=$DEFAULT_INI -ini=$APPKIT_INI $FRAMEWORK/NSTextFieldCell.h > ../appkit/NSTextFieldCell.inc
#./objcparser -ini=$DEFAULT_INI -ini=$APPKIT_INI $FRAMEWORK/NSTextView.h > ../appkit/NSTextView.inc
#./objcparser -ini=$DEFAULT_INI -ini=$APPKIT_INI $FRAMEWORK/NSToolbar.h > ../appkit/NSToolbar.inc
#./objcparser -ini=$DEFAULT_INI -ini=$APPKIT_INI $FRAMEWORK/NSToolbarItem.h > ../appkit/NSToolbarItem.inc
#./objcparser -ini=$DEFAULT_INI -ini=$APPKIT_INI $FRAMEWORK/NSUserInterfaceValidation.h > ../appkit/NSUserInterfaceValidation.inc

View File

@ -5,7 +5,7 @@ LOCAL_INI="../build/foundation.ini"
FRAMEWORK="/System/Library/Frameworks/Foundation.framework/Headers"
#./objcparser -ini=$DEFAULT_INI -ini=$LOCAL_INI $FRAMEWORK/NSObjCRuntime.h > ../foundation/NSObjCRuntime.inc
#./objcparser -ini=$DEFAULT_INI -ini=$LOCAL_INI $FRAMEWORK/NSArray.h > ../foundation/NSArray.inc
./objcparser -ini=$DEFAULT_INI -ini=$LOCAL_INI $FRAMEWORK/NSBundle.h > ../foundation/NSBundle.inc
#./objcparser -ini=$DEFAULT_INI -ini=$LOCAL_INI $FRAMEWORK/NSBundle.h > ../foundation/NSBundle.inc
#./objcparser -ini=$DEFAULT_INI -ini=$LOCAL_INI $FRAMEWORK/NSDate.h > ../foundation/NSDate.inc
#./objcparser -ini=$DEFAULT_INI -ini=$LOCAL_INI $FRAMEWORK/NSRange.h > ../foundation/NSRange.inc
#./objcparser -ini=$DEFAULT_INI -ini=$LOCAL_INI $FRAMEWORK/NSString.h > ../foundation/NSString.inc

View File

@ -1,12 +1,14 @@
<?xml version="1.0"?>
<CONFIG>
<ProjectOptions>
<PathDelim Value="/"/>
<Version Value="6"/>
<Version Value="7"/>
<General>
<Flags>
<LRSInOutputDirectory Value="False"/>
</Flags>
<MainUnit Value="0"/>
<TargetFileExt Value=""/>
<ActiveEditorIndexAtStart Value="0"/>
<ActiveEditorIndexAtStart Value="8"/>
</General>
<VersionInfo>
<ProjectVersion Value=""/>
@ -30,15 +32,15 @@
<PackageName Value="cocoa_pkg"/>
</Item1>
</RequiredPackages>
<Units Count="18">
<Units Count="21">
<Unit0>
<Filename Value="texteditor.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="texteditor"/>
<CursorPos X="31" Y="7"/>
<TopLine Value="43"/>
<CursorPos X="1" Y="62"/>
<TopLine Value="39"/>
<EditorIndex Value="0"/>
<UsageCount Value="62"/>
<UsageCount Value="74"/>
<Loaded Value="True"/>
</Unit0>
<Unit1>
@ -48,17 +50,17 @@
<CursorPos X="24" Y="32"/>
<TopLine Value="27"/>
<EditorIndex Value="5"/>
<UsageCount Value="62"/>
<UsageCount Value="74"/>
<Loaded Value="True"/>
</Unit1>
<Unit2>
<Filename Value="view.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="view"/>
<CursorPos X="49" Y="40"/>
<TopLine Value="72"/>
<CursorPos X="1" Y="232"/>
<TopLine Value="208"/>
<EditorIndex Value="7"/>
<UsageCount Value="62"/>
<UsageCount Value="74"/>
<Loaded Value="True"/>
</Unit2>
<Unit3>
@ -68,7 +70,7 @@
<CursorPos X="21" Y="30"/>
<TopLine Value="20"/>
<EditorIndex Value="6"/>
<UsageCount Value="62"/>
<UsageCount Value="74"/>
<Loaded Value="True"/>
</Unit3>
<Unit4>
@ -78,7 +80,7 @@
<CursorPos X="1" Y="77"/>
<TopLine Value="75"/>
<EditorIndex Value="2"/>
<UsageCount Value="57"/>
<UsageCount Value="69"/>
<Loaded Value="True"/>
</Unit4>
<Unit5>
@ -87,203 +89,234 @@
<CursorPos X="50" Y="3"/>
<TopLine Value="27"/>
<EditorIndex Value="3"/>
<UsageCount Value="27"/>
<UsageCount Value="34"/>
<Loaded Value="True"/>
</Unit5>
<Unit6>
<Filename Value="../../foundation/foundation.pas"/>
<UnitName Value="foundation"/>
<CursorPos X="30" Y="12"/>
<CursorPos X="98" Y="3"/>
<TopLine Value="1"/>
<EditorIndex Value="8"/>
<UsageCount Value="22"/>
<Loaded Value="True"/>
<UsageCount Value="27"/>
</Unit6>
<Unit7>
<Filename Value="../../appkit/NSToolbarItem.inc"/>
<CursorPos X="49" Y="5"/>
<TopLine Value="4"/>
<UsageCount Value="7"/>
<UsageCount Value="6"/>
</Unit7>
<Unit8>
<Filename Value="../../appkit/appkit.pas"/>
<UnitName Value="appkit"/>
<CursorPos X="28" Y="9"/>
<TopLine Value="1"/>
<UsageCount Value="9"/>
<UsageCount Value="8"/>
</Unit8>
<Unit9>
<Filename Value="../../../objc/objc.inc"/>
<CursorPos X="13" Y="60"/>
<TopLine Value="46"/>
<EditorIndex Value="4"/>
<UsageCount Value="24"/>
<UsageCount Value="31"/>
<Loaded Value="True"/>
</Unit9>
<Unit10>
<Filename Value="../../appkit/NSApplication.inc"/>
<CursorPos X="31" Y="1047"/>
<TopLine Value="1041"/>
<UsageCount Value="8"/>
<UsageCount Value="7"/>
</Unit10>
<Unit11>
<Filename Value="../../appkit/NSAlert.inc"/>
<CursorPos X="16" Y="8"/>
<TopLine Value="1"/>
<UsageCount Value="10"/>
<UsageCount Value="9"/>
</Unit11>
<Unit12>
<Filename Value="../../appkit/AppKit.inc"/>
<CursorPos X="19" Y="51"/>
<TopLine Value="49"/>
<CursorPos X="43" Y="29"/>
<TopLine Value="21"/>
<EditorIndex Value="8"/>
<UsageCount Value="22"/>
<Loaded Value="True"/>
</Unit12>
<Unit13>
<Filename Value="../../foundation/Foundation.inc"/>
<CursorPos X="48" Y="9"/>
<TopLine Value="5"/>
<UsageCount Value="9"/>
<UsageCount Value="8"/>
</Unit13>
<Unit14>
<Filename Value="../../appkit/NSBundle.inc"/>
<CursorPos X="34" Y="6"/>
<TopLine Value="1"/>
<UsageCount Value="8"/>
<UsageCount Value="7"/>
</Unit14>
<Unit15>
<Filename Value="../../foundation/NSBundle.inc"/>
<CursorPos X="35" Y="409"/>
<TopLine Value="403"/>
<UsageCount Value="22"/>
<UsageCount Value="21"/>
</Unit15>
<Unit16>
<Filename Value="../../appkit/NSNibLoading.inc"/>
<CursorPos X="41" Y="42"/>
<TopLine Value="33"/>
<UsageCount Value="8"/>
<UsageCount Value="7"/>
</Unit16>
<Unit17>
<Filename Value="../../foundation/NSObject.inc"/>
<CursorPos X="9" Y="251"/>
<TopLine Value="240"/>
<EditorIndex Value="1"/>
<UsageCount Value="21"/>
<UsageCount Value="28"/>
<Loaded Value="True"/>
</Unit17>
<Unit18>
<Filename Value="../../../../../smart-house/weather-station-client/target/generated/src/main/java/br/usp/pcs/weather/GlobalWeatherService.java"/>
<CursorPos X="35" Y="20"/>
<TopLine Value="8"/>
<UsageCount Value="12"/>
<Loaded Value="True"/>
<SyntaxHighlighter Value="Java"/>
</Unit18>
<Unit19>
<Filename Value="../../../../../smart-house/weather-station-client/target/generated/src/main/java/br/usp/pcs/weather/WeatherServiceService.java"/>
<CursorPos X="102" Y="12"/>
<TopLine Value="6"/>
<UsageCount Value="10"/>
<SyntaxHighlighter Value="Java"/>
</Unit19>
<Unit20>
<Filename Value="../../appkit/NSTextView.inc"/>
<CursorPos X="63" Y="288"/>
<TopLine Value="276"/>
<EditorIndex Value="9"/>
<UsageCount Value="11"/>
<Loaded Value="True"/>
</Unit20>
</Units>
<JumpHistory Count="28" HistoryIndex="27">
<JumpHistory Count="30" HistoryIndex="29">
<Position1>
<Filename Value="controller.pas"/>
<Caret Line="74" Column="15" TopLine="59"/>
</Position1>
<Position2>
<Filename Value="../../../objc/objc.pas"/>
<Caret Line="27" Column="12" TopLine="19"/>
</Position2>
<Position3>
<Filename Value="mytoolbar.pas"/>
<Caret Line="149" Column="9" TopLine="134"/>
</Position3>
<Position4>
<Filename Value="view.pas"/>
<Caret Line="218" Column="77" TopLine="200"/>
</Position1>
<Position2>
<Filename Value="controller.pas"/>
<Caret Line="132" Column="5" TopLine="109"/>
</Position2>
<Position3>
<Filename Value="controller.pas"/>
<Caret Line="108" Column="1" TopLine="94"/>
</Position3>
<Position4>
<Filename Value="controller.pas"/>
<Caret Line="51" Column="17" TopLine="39"/>
</Position4>
<Position5>
<Filename Value="controller.pas"/>
<Caret Line="132" Column="5" TopLine="109"/>
<Caret Line="123" Column="35" TopLine="118"/>
</Position5>
<Position6>
<Filename Value="controller.pas"/>
<Caret Line="108" Column="1" TopLine="94"/>
<Caret Line="125" Column="61" TopLine="113"/>
</Position6>
<Position7>
<Filename Value="controller.pas"/>
<Caret Line="51" Column="17" TopLine="39"/>
<Caret Line="103" Column="38" TopLine="91"/>
</Position7>
<Position8>
<Filename Value="controller.pas"/>
<Caret Line="123" Column="35" TopLine="118"/>
<Caret Line="126" Column="32" TopLine="113"/>
</Position8>
<Position9>
<Filename Value="controller.pas"/>
<Caret Line="125" Column="61" TopLine="113"/>
<Caret Line="125" Column="1" TopLine="108"/>
</Position9>
<Position10>
<Filename Value="controller.pas"/>
<Caret Line="103" Column="38" TopLine="91"/>
<Caret Line="139" Column="1" TopLine="122"/>
</Position10>
<Position11>
<Filename Value="controller.pas"/>
<Caret Line="126" Column="32" TopLine="113"/>
<Caret Line="144" Column="44" TopLine="132"/>
</Position11>
<Position12>
<Filename Value="controller.pas"/>
<Caret Line="125" Column="1" TopLine="108"/>
<Filename Value="view.pas"/>
<Caret Line="158" Column="29" TopLine="138"/>
</Position12>
<Position13>
<Filename Value="controller.pas"/>
<Caret Line="139" Column="1" TopLine="122"/>
<Filename Value="view.pas"/>
<Caret Line="33" Column="60" TopLine="19"/>
</Position13>
<Position14>
<Filename Value="controller.pas"/>
<Caret Line="144" Column="44" TopLine="132"/>
<Filename Value="view.pas"/>
<Caret Line="207" Column="39" TopLine="199"/>
</Position14>
<Position15>
<Filename Value="view.pas"/>
<Caret Line="158" Column="29" TopLine="138"/>
<Caret Line="33" Column="17" TopLine="19"/>
</Position15>
<Position16>
<Filename Value="view.pas"/>
<Caret Line="33" Column="60" TopLine="19"/>
<Caret Line="211" Column="9" TopLine="197"/>
</Position16>
<Position17>
<Filename Value="view.pas"/>
<Caret Line="207" Column="39" TopLine="199"/>
<Caret Line="33" Column="78" TopLine="33"/>
</Position17>
<Position18>
<Filename Value="view.pas"/>
<Caret Line="33" Column="17" TopLine="19"/>
<Caret Line="208" Column="25" TopLine="197"/>
</Position18>
<Position19>
<Filename Value="view.pas"/>
<Caret Line="211" Column="9" TopLine="197"/>
<Caret Line="148" Column="1" TopLine="130"/>
</Position19>
<Position20>
<Filename Value="view.pas"/>
<Caret Line="33" Column="78" TopLine="33"/>
<Caret Line="133" Column="65" TopLine="121"/>
</Position20>
<Position21>
<Filename Value="view.pas"/>
<Caret Line="208" Column="25" TopLine="197"/>
<Caret Line="146" Column="69" TopLine="125"/>
</Position21>
<Position22>
<Filename Value="view.pas"/>
<Caret Line="148" Column="1" TopLine="130"/>
<Caret Line="194" Column="73" TopLine="192"/>
</Position22>
<Position23>
<Filename Value="view.pas"/>
<Caret Line="133" Column="65" TopLine="121"/>
</Position23>
<Position24>
<Filename Value="view.pas"/>
<Caret Line="146" Column="69" TopLine="125"/>
</Position24>
<Position25>
<Filename Value="view.pas"/>
<Caret Line="194" Column="73" TopLine="192"/>
</Position25>
<Position26>
<Filename Value="../../foundation/NSObject.inc"/>
<Caret Line="249" Column="1" TopLine="239"/>
</Position26>
<Position27>
</Position23>
<Position24>
<Filename Value="../../foundation/NSObject.inc"/>
<Caret Line="263" Column="1" TopLine="250"/>
</Position27>
<Position28>
</Position24>
<Position25>
<Filename Value="../../foundation/NSObject.inc"/>
<Caret Line="270" Column="15" TopLine="260"/>
</Position25>
<Position26>
<Filename Value="view.pas"/>
<Caret Line="67" Column="5" TopLine="46"/>
</Position26>
<Position27>
<Filename Value="../../appkit/AppKit.inc"/>
<Caret Line="34" Column="25" TopLine="23"/>
</Position27>
<Position28>
<Filename Value="../../appkit/AppKit.inc"/>
<Caret Line="106" Column="16" TopLine="93"/>
</Position28>
<Position29>
<Filename Value="../../appkit/NSTextView.inc"/>
<Caret Line="229" Column="1" TopLine="222"/>
</Position29>
<Position30>
<Filename Value="../../appkit/AppKit.inc"/>
<Caret Line="3" Column="51" TopLine="1"/>
</Position30>
</JumpHistory>
</ProjectOptions>
<CompilerOptions>

View File

@ -49,16 +49,17 @@ type
procedure CreateUserInterface();
end;
var
myView: TMyView;
const
Str_Window_Title = 'Text Editor';
var
MyView: TMyView = nil;
implementation
uses controller, model;
{@@
}
procedure TMyView.CreateUserInterface();
@ -191,16 +192,21 @@ end;
{@@
Creates a new menu item from a title
}
function TMyView.CreateMenuItem(ATitle: shortstring; ACallback: string; ATarget: objc.id): NSMenuItem;
function TMyView.CreateMenuItem(ATitle: shortstring;
ACallback: string; ATarget: objc.id): NSMenuItem;
var
ItemText: CFStringRef;
KeyText: CFStringRef;
begin
KeyText := CFStringCreateWithPascalString(nil, '', kCFStringEncodingUTF8);
ItemText := CFStringCreateWithPascalString(nil, ATitle, kCFStringEncodingUTF8);
WriteLn(' ItemText: ', IntToHex(Int64(ItemText), 8), ' ATitle: ', ATitle);
KeyText := CFStringCreateWithPascalString(nil, '',
kCFStringEncodingUTF8);
ItemText := CFStringCreateWithPascalString(nil, ATitle,
kCFStringEncodingUTF8);
WriteLn(' ItemText: ', IntToHex(Int64(ItemText), 8),
' ATitle: ', ATitle);
Result := NSMenuItem.initWithTitle_action_keyEquivalent(ItemText, nil, KeyText);
Result := NSMenuItem.initWithTitle_action_keyEquivalent(
ItemText, nil, KeyText);
Result.setTarget(ATarget);
Result.setAction(sel_registerName(PChar(ACallback)));

View File

@ -28,7 +28,7 @@
<RunParams>
<local>
<FormatVersion Value="1"/>
<LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
<LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
</local>
</RunParams>
<Units Count="4">