paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-12 09:59:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Improves Cocoa widgetset

Browse Source 
git-svn-id: trunk@15554 -
This commit is contained in:
sekelsenmat 2008-06-24 02:02:25 +00:00
parent b7dbfbdfe9
commit 98bf837c8d
2 changed files with 78 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

104
lcl/interfaces/cocoa/cocoaprivate.pp
View File

@ -21,7 +21,7 @@
}
unit CocoaPrivate;
{$mode objfpc}{$H+}
{$mode delphi}
interface
@ -39,6 +39,9 @@ uses
LMessages, LCLMessageGlue, LCLProc, LCLType, Graphics, Controls, Forms,
Dialogs, StdCtrls, Buttons, ComCtrls, ExtCtrls, Menus;
const
Str_Button_OnClick = 'ButtonOnClick';
type
{ TCocoaForm }
@ -57,25 +60,30 @@ type
{ TCocoaControl }
TCocoaControl = class(TObject)
TCocoaControl = class(NSObject)
public
{ classes }
ParentView: NSView;
Control: NSControl;
LCLControl: TWinControl;
{ strings and sizes }
CFTitle: CFStringRef;
ControlRect: NSRect;
public
constructor Create(const AWinControl: TWinControl; const AParams: TCreateParams);
procedure InitializeFields;
procedure InitializeControl;
end;
{ TCocoaButton }
TCocoaButton = class(TCocoaControl)
public
{ classes }
Handle: NSButton;
public
constructor Create(const AWinControl: TWinControl; const AParams: TCreateParams);
function Button: NSButton;
procedure AddMethods; override;
{ Objective-c Methods }
class procedure ButtonOnClick(_self: objc.id; _cmd: SEL; sender: objc.id); cdecl;
end;
implementation
@ -101,6 +109,44 @@ begin
MainWindow.setTitle(CFTitle);
end;
{ TCocoaControl }
constructor TCocoaControl.Create(const AWinControl: TWinControl;
const AParams: TCreateParams);
begin
{ The class is registered on the Objective-C runtime before the NSObject constructor is called }
if not CreateClassDefinition(ClassName(), Str_NSObject) then Exception.Create('Failed to create objc class: ' + ClassName());
inherited Create;
// Initializes information fields
LCLControl := AWinControl;
InitializeFields();
end;
procedure TCocoaControl.InitializeFields;
begin
CFTitle := CFStringCreateWithPascalString(nil, LCLControl.Caption, kCFStringEncodingUTF8);
ControlRect.origin.x := LCLControl.Left;
ControlRect.origin.y := LCLControl.Top;
ControlRect.size.width := LCLControl.Width;
ControlRect.size.height := LCLControl.Height;
if LCLControl.Parent <> nil then
begin
if LCLControl.Parent is TCustomForm then
begin
ParentView := TCocoaForm(LCLControl.Parent.Handle).MainWindowView;
end;
end;
end;
procedure TCocoaControl.InitializeControl;
begin
Control.setTag(PtrInt(Self));
end;
{ TCocoaButton }
constructor TCocoaButton.Create(const AWinControl: TWinControl;
@ -108,33 +154,37 @@ constructor TCocoaButton.Create(const AWinControl: TWinControl;
begin
inherited Create(AWinControl, AParams);
Handle := NSButton.initWithFrame(ControlRect);
Handle.setTitle(CFTitle);
Handle.setBezelStyle(NSRoundedBezelStyle);
// Handle.setAction(sel_registerName(PChar(ACallbackName)));
// Handle.setTarget(ACallbackClass.Handle);
Control := NSButton.initWithFrame(ControlRect);
Button.setTitle(CFTitle);
Button.setBezelStyle(NSRoundedBezelStyle);
Button.setAction(sel_registerName(PChar(Str_Button_OnClick)));
Button.setTarget(Handle);
if ParentView <> nil then ParentView.addSubview(Handle);
if ParentView <> nil then ParentView.addSubview(Button);
end;
{ TCocoaControl }
constructor TCocoaControl.Create(const AWinControl: TWinControl;
const AParams: TCreateParams);
function TCocoaButton.Button: NSButton;
begin
CFTitle := CFStringCreateWithPascalString(nil, AWinControl.Caption, kCFStringEncodingUTF8);
Result := NSButton(Control);
end;
ControlRect.origin.x := AWinControl.Left;
ControlRect.origin.y := AWinControl.Top;
ControlRect.size.width := AWinControl.Width;
ControlRect.size.height := AWinControl.Height;
if AWinControl.Parent <> nil then
begin
if AWinControl.Parent is TCustomForm then
begin
ParentView := TCocoaForm(AWinControl.Parent.Handle).MainWindowView;
end;
procedure TCocoaButton.AddMethods;
begin
AddMethod(Str_Button_OnClick, 'v@:@', Pointer(ButtonOnClick));
end;
class procedure TCocoaButton.ButtonOnClick(_self: objc.id; _cmd: SEL; sender: objc.id); cdecl;
var
VSelf: TCocoaButton;
VNSControl: NSControl;
begin
VNSControl := NSControl.CreateWithHandle(sender);
try
VSelf := TCocoaButton(VNSControl.tag);
VSelf.LCLControl.OnClick(VSelf.LCLControl);
finally
VNSControl.Handle := nil;
VNSControl.Free;
end;
end;

2
lcl/interfaces/cocoa/cocoawsstdctrls.pp
View File

@ -328,7 +328,7 @@ var
CocoaButton: TCocoaButton;
begin
CocoaButton := TCocoaButton.Create(AWinControl, AParams);
CocoaButton.Handle.setButtonType(NSSwitchButton);
CocoaButton.Button.setButtonType(NSSwitchButton);
Result := TLCLIntfHandle(CocoaButton);
end;