mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-05-31 01:02:39 +02:00
cocoa: implemented CocoaWSComboBox api. removed unused WS classes
git-svn-id: trunk@27285 -
This commit is contained in:
dmitry
parent
9a31e1e0ce
commit
3a97736476
@ -176,10 +176,31 @@ type
|
||||
callback : TCommonCallback;
|
||||
end;
|
||||
|
||||
|
||||
TCocoaComboBox = objcclass;
|
||||
|
||||
{ TCocoaComboBoxList }
|
||||
|
||||
TCocoaComboBoxList = class(TStringList)
|
||||
private
|
||||
fOwner : TCocoaComboBox;
|
||||
protected
|
||||
procedure Changed; override;
|
||||
public
|
||||
constructor Create(AOwner: TCocoaComboBox);
|
||||
property Owner: TCocoaComboBox read fOwner;
|
||||
end;
|
||||
|
||||
{ TCocoaComboBox }
|
||||
|
||||
TCocoaComboBox = objcclass(NSComboBox)
|
||||
callback : TCommonCallback;
|
||||
list : TCocoaComboBoxList;
|
||||
function comboBox_objectValueForItemAtIndex_(combo: TCocoaComboBox; row: NSInteger): id;
|
||||
message 'comboBox:objectValueForItemAtIndex:';
|
||||
function numberOfItemsInComboBox(combo: TCocoaComboBox): NSInteger;
|
||||
message 'numberOfItemsInComboBox:';
|
||||
procedure dealloc; override;
|
||||
end;
|
||||
|
||||
{ TCocoaScrollBar }
|
||||
@ -636,5 +657,43 @@ begin
|
||||
inherited Create;
|
||||
end;
|
||||
|
||||
{ TCocoaComboBoxList }
|
||||
|
||||
procedure TCocoaComboBoxList.Changed;
|
||||
begin
|
||||
fOwner.reloadData;
|
||||
inherited Changed;
|
||||
end;
|
||||
|
||||
constructor TCocoaComboBoxList.Create(AOwner:TCocoaComboBox);
|
||||
begin
|
||||
fOwner:=AOwner;
|
||||
end;
|
||||
|
||||
{ TCocoaComboBox }
|
||||
|
||||
function TCocoaComboBox.comboBox_objectValueForItemAtIndex_(combo:TCocoaComboBox;
|
||||
row: NSInteger):id;
|
||||
begin
|
||||
if not Assigned(list) or (row<0) or (row>=list.Count)
|
||||
then Result:=nil
|
||||
else Result:=NSStringUtf8(list[row]);
|
||||
end;
|
||||
|
||||
function TCocoaComboBox.numberOfItemsInComboBox(combo:TCocoaComboBox):NSInteger;
|
||||
begin
|
||||
if not Assigned(list) then Result:=0
|
||||
else Result:=list.Count;
|
||||
end;
|
||||
|
||||
procedure TCocoaComboBox.dealloc;
|
||||
begin
|
||||
if Assigned(list) then begin
|
||||
list.Free;
|
||||
list:=nil;
|
||||
end;
|
||||
inherited release;
|
||||
end;
|
||||
|
||||
end.
|
||||
|
||||
|
||||
@ -54,41 +54,29 @@ type
|
||||
class function CreateHandle(const AWinControl: TWinControl; const AParams: TCreateParams): TLCLIntfHandle; override;
|
||||
end;
|
||||
|
||||
{ TCocoaWSGroupBox }
|
||||
|
||||
TCocoaWSGroupBox = class(TWSGroupBox)
|
||||
private
|
||||
protected
|
||||
public
|
||||
end;
|
||||
|
||||
{ TCocoaWSCustomComboBox }
|
||||
|
||||
TCocoaWSCustomComboBox = class(TWSCustomComboBox)
|
||||
published
|
||||
class function CreateHandle(const AWinControl: TWinControl; const AParams: TCreateParams): TLCLIntfHandle; override;
|
||||
{class function GetSelStart(const ACustomComboBox: TCustomComboBox): integer; override;
|
||||
class function GetSelLength(const ACustomComboBox: TCustomComboBox): integer; override;
|
||||
class function GetSelLength(const ACustomComboBox: TCustomComboBox): integer; override;}
|
||||
class function GetItemIndex(const ACustomComboBox: TCustomComboBox): integer; override;
|
||||
class function GetMaxLength(const ACustomComboBox: TCustomComboBox): integer; override;
|
||||
{class function GetMaxLength(const ACustomComboBox: TCustomComboBox): integer; override;
|
||||
|
||||
class procedure SetSelStart(const ACustomComboBox: TCustomComboBox; NewStart: integer); override;
|
||||
class procedure SetSelLength(const ACustomComboBox: TCustomComboBox; NewLength: integer); override;
|
||||
class procedure SetSelLength(const ACustomComboBox: TCustomComboBox; NewLength: integer); override;}
|
||||
class procedure SetItemIndex(const ACustomComboBox: TCustomComboBox; NewIndex: integer); override;
|
||||
class procedure SetMaxLength(const ACustomComboBox: TCustomComboBox; NewLength: integer); override;
|
||||
class procedure SetStyle(const ACustomComboBox: TCustomComboBox; NewStyle: TComboBoxStyle); override;
|
||||
{class procedure SetMaxLength(const ACustomComboBox: TCustomComboBox; NewLength: integer); override;
|
||||
class procedure SetStyle(const ACustomComboBox: TCustomComboBox; NewStyle: TComboBoxStyle); override;}
|
||||
class procedure SetReadOnly(const ACustomComboBox: TCustomComboBox; NewReadOnly: boolean); override;
|
||||
}
|
||||
class procedure SetDropDownCount(const ACustomComboBox: TCustomComboBox; NewCount: Integer); override;
|
||||
|
||||
class function GetItems(const ACustomComboBox: TCustomComboBox): TStrings; override;
|
||||
{class procedure Sort(const ACustomComboBox: TCustomComboBox; AList: TStrings; IsSorted: boolean); override;}
|
||||
end;
|
||||
|
||||
{ TCocoaWSComboBox }
|
||||
|
||||
TCocoaWSComboBox = class(TWSComboBox)
|
||||
private
|
||||
protected
|
||||
public
|
||||
class function GetItemHeight(const ACustomComboBox: TCustomComboBox): Integer; override;
|
||||
class procedure SetItemHeight(const ACustomComboBox: TCustomComboBox; const AItemHeight: Integer); override;
|
||||
end;
|
||||
|
||||
{ TCocoaWSCustomListBox }
|
||||
@ -114,14 +102,6 @@ type
|
||||
class procedure SetTopIndex(const ACustomListBox: TCustomListBox; const NewTopIndex: integer); override;}
|
||||
end;
|
||||
|
||||
{ TCocoaWSListBox }
|
||||
|
||||
TCocoaWSListBox = class(TWSListBox)
|
||||
private
|
||||
protected
|
||||
public
|
||||
end;
|
||||
|
||||
{ TCocoaWSCustomEdit }
|
||||
|
||||
TCocoaWSCustomEdit = class(TWSCustomEdit)
|
||||
@ -157,43 +137,6 @@ type
|
||||
class function GetText(const AWinControl: TWinControl; var AText: String): Boolean; override;
|
||||
end;
|
||||
|
||||
{ TCocoaWSEdit }
|
||||
|
||||
TCocoaWSEdit = class(TWSEdit)
|
||||
private
|
||||
protected
|
||||
public
|
||||
end;
|
||||
|
||||
{ TCocoaWSMemo }
|
||||
|
||||
TCocoaWSMemo = class(TWSMemo)
|
||||
private
|
||||
protected
|
||||
public
|
||||
end;
|
||||
|
||||
{ TCocoaWSCustomLabel }
|
||||
|
||||
{TCocoaWSCustomLabel = class(TWSCustomLabel)
|
||||
private
|
||||
protected
|
||||
public
|
||||
end;}
|
||||
|
||||
{ TCocoaWSLabel }
|
||||
|
||||
{TCocoaWSLabel = class(TWSLabel)
|
||||
private
|
||||
protected
|
||||
public
|
||||
end;}
|
||||
|
||||
{ TCocoaWSButtonControl }
|
||||
|
||||
TCocoaWSButtonControl = class(TWSButtonControl)
|
||||
end;
|
||||
|
||||
{ TCocoaWSButton }
|
||||
|
||||
TCocoaWSButton = class(TWSButton)
|
||||
@ -211,14 +154,6 @@ type
|
||||
class procedure SetState(const ACustomCheckBox: TCustomCheckBox; const NewState: TCheckBoxState); override;
|
||||
end;
|
||||
|
||||
{ TCocoaWSCheckBox }
|
||||
|
||||
TCocoaWSCheckBox = class(TWSCheckBox)
|
||||
private
|
||||
protected
|
||||
public
|
||||
end;
|
||||
|
||||
{ TCocoaWSToggleBox }
|
||||
|
||||
TCocoaWSToggleBox = class(TWSToggleBox)
|
||||
@ -243,14 +178,6 @@ type
|
||||
// class procedure SetAlignment(const ACustomStaticText: TCustomStaticText; const NewAlignment: TAlignment); override;
|
||||
end;
|
||||
|
||||
{ TCocoaWSStaticText }
|
||||
|
||||
TCocoaWSStaticText = class(TWSStaticText)
|
||||
private
|
||||
protected
|
||||
public
|
||||
end;
|
||||
|
||||
function AllocTextView(ATarget: TWinControl; const AParams: TCreateParams; fieldEditor: Boolean): NSTextView;
|
||||
function AllocButton(ATarget: TWinControl; const AParams: TCreateParams; btnBezel: NSBezelStyle; btnType: NSButtonType): NSButton;
|
||||
function AllocTextField(ATarget: TWinControl; const AParams: TCreateParams): TCocoaTextField;
|
||||
@ -659,17 +586,72 @@ class function TCocoaWSCustomComboBox.CreateHandle(const AWinControl:TWinControl
|
||||
const AParams:TCreateParams):TLCLIntfHandle;
|
||||
var
|
||||
cmb : TCocoaComboBox;
|
||||
ns : NSRect;
|
||||
begin
|
||||
cmb := NSView(TCocoaComboBox.alloc).lclInitWithCreateParams(AParams);
|
||||
if not Assigned(cmb) then begin
|
||||
Result:=0;
|
||||
Exit;
|
||||
end;
|
||||
|
||||
cmb.callback:=TLCLCommonCallback.Create(cmb, AWinControl);
|
||||
cmb.list:=TCocoaComboBoxList.Create(cmb);
|
||||
cmb.setUsesDataSource(true);
|
||||
cmb.setDataSource(cmb);
|
||||
Result:=TLCLIntfHandle(cmb);
|
||||
//todo: 26 pixels is the height of 'normal' combobox. The value is taken from the Interface Builder!
|
||||
// use the correct way to set the size constraints
|
||||
AWinControl.Constraints.SetInterfaceConstraints(0,26,0,26);
|
||||
end;
|
||||
|
||||
class function TCocoaWSCustomComboBox.GetItems(const ACustomComboBox:
|
||||
TCustomComboBox):TStrings;
|
||||
class function TCocoaWSCustomComboBox.GetItemIndex(const ACustomComboBox:
|
||||
TCustomComboBox):integer;
|
||||
begin
|
||||
//todo: implement cocoa string items
|
||||
Result:=TStringList.Create;
|
||||
if Assigned(ACustomComboBox) and (ACustomComboBox.Handle<>0) then
|
||||
Result:=TCocoaComboBox(ACustomComboBox.Handle).indexOfSelectedItem;
|
||||
end;
|
||||
|
||||
class procedure TCocoaWSCustomComboBox.SetItemIndex(const ACustomComboBox:
|
||||
TCustomComboBox;NewIndex:integer);
|
||||
begin
|
||||
if Assigned(ACustomComboBox) and (ACustomComboBox.Handle<>0) then
|
||||
TCocoaComboBox(ACustomComboBox.Handle).selectItemAtIndex(NewIndex);
|
||||
end;
|
||||
|
||||
class procedure TCocoaWSCustomComboBox.SetReadOnly(const ACustomComboBox:
|
||||
TCustomComboBox;NewReadOnly:boolean);
|
||||
begin
|
||||
if Assigned(ACustomComboBox) and (ACustomComboBox.Handle<>0) then begin
|
||||
TCocoaComboBox(ACustomComboBox.Handle).setEditable(not NewReadOnly);
|
||||
TCocoaComboBox(ACustomComboBox.Handle).setSelectable(True);
|
||||
end;
|
||||
end;
|
||||
|
||||
class procedure TCocoaWSCustomComboBox.SetDropDownCount(const ACustomComboBox:
|
||||
TCustomComboBox;NewCount:Integer);
|
||||
begin
|
||||
if Assigned(ACustomComboBox) and (ACustomComboBox.Handle<>0) then
|
||||
TCocoaComboBox(ACustomComboBox.Handle).setNumberOfVisibleItems(NewCount);
|
||||
end;
|
||||
|
||||
class function TCocoaWSCustomComboBox.GetItems(const ACustomComboBox: TCustomComboBox):TStrings;
|
||||
begin
|
||||
if Assigned(ACustomComboBox) and (ACustomComboBox.Handle<>0) then
|
||||
Result:=TCocoaComboBox(ACustomComboBox.Handle).list;
|
||||
end;
|
||||
|
||||
class function TCocoaWSCustomComboBox.GetItemHeight(const ACustomComboBox:
|
||||
TCustomComboBox):Integer;
|
||||
begin
|
||||
if Assigned(ACustomComboBox) and (ACustomComboBox.Handle<>0) then
|
||||
Result:=Round(TCocoaComboBox(ACustomComboBox.Handle).itemHeight);
|
||||
end;
|
||||
|
||||
class procedure TCocoaWSCustomComboBox.SetItemHeight(const ACustomComboBox:
|
||||
TCustomComboBox;const AItemHeight:Integer);
|
||||
begin
|
||||
if Assigned(ACustomComboBox) and (ACustomComboBox.Handle<>0) then
|
||||
TCocoaComboBox(ACustomComboBox.Handle).setItemHeight(AItemHeight);
|
||||
end;
|
||||
|
||||
{ TCocoaWSToggleBox }
|
||||
|
||||
Loading…
Reference in New Issue
Block a user