paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-11-20 18:59:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

cocoa: moved tableView_objectValueForTableColumn_row method to Cell-based NSTextView only

Browse Source 
git-svn-id: trunk@58836 -
This commit is contained in:
dmitry 2018-09-03 02:07:00 +00:00
parent c113088c69
commit 85d679f731
1 changed files with 48 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
lcl/interfaces/cocoa/cocoatables.pas
View File

@ -117,7 +117,6 @@ type
// NSTableViewDataSourceProtocol
function numberOfRowsInTableView(tableView: NSTableView): NSInteger; message 'numberOfRowsInTableView:';
function tableView_objectValueForTableColumn_row(tableView: NSTableView; tableColumn: NSTableColumn; row: NSInteger): id; message 'tableView:objectValueForTableColumn:row:';
//procedure tableView_sortDescriptorsDidChange(tableView: NSTableView; oldDescriptors: NSArray); message 'tableView:sortDescriptorsDidChange:';
//function tableView_writeRowsWithIndexes_toPasteboard(tableView: NSTableView; rowIndexes: NSIndexSet; pboard: NSPasteboard): Boolean; message 'tableView:writeRowsWithIndexes:toPasteboard:';
//function tableView_validateDrop_proposedRow_proposedDropOperation(tableView: NSTableView; info: NSDraggingInfoProtocol; row: NSInteger; dropOperation: NSTableViewDropOperation): NSDragOperation; message 'tableView:validateDrop:proposedRow:proposedDropOperation:';
@ -187,6 +186,7 @@ type
TCellCocoaTableListView = objcclass(TCocoaTableListView, NSTableViewDelegateProtocol, NSTableViewDataSourceProtocol)
public
function tableView_objectValueForTableColumn_row(tableView: NSTableView; tableColumn: NSTableColumn; row: NSInteger): id; message 'tableView:objectValueForTableColumn:row:';
procedure tableView_setObjectValue_forTableColumn_row(tableView: NSTableView; object_: id; tableColumn: NSTableColumn; row: NSInteger); message 'tableView:setObjectValue:forTableColumn:row:';
function tableView_dataCellForTableColumn_row(tableView: NSTableView; tableColumn: NSTableColumn; row: NSInteger): NSCell; message 'tableView:dataCellForTableColumn:row:';
end;
@ -236,6 +236,8 @@ function AllocCocoaTableListView: TCocoaTableListView;
implementation
{$DEFINE DYNAMIC_NSTABLEVIEW_BASE}
function AllocCocoaTableListView: TCocoaTableListView; // init will happen outside
begin
{$IFDEF DYNAMIC_NSTABLEVIEW_BASE}
@ -541,51 +543,6 @@ begin
Result := 0;
end;
function TCocoaTableListView.tableView_objectValueForTableColumn_row(
tableView: NSTableView; tableColumn: NSTableColumn; row: NSInteger): id;
var
lStringList: TStringList;
col: NSInteger;
StrResult: NSString;
chk : Integer;
txt : string;
begin
{$IFDEF COCOA_DEBUG_TABCONTROL}
WriteLn(Format('[TCocoaTableListView.tableView_objectValueForTableColumn_row] col=%d row=%d Items.Count=%d',
[col, row, Items.Count]));
{$ENDIF}
Result := nil;
if not Assigned(callback) then Exit;
col := getIndexOfColumn(tableColumn);
if (col = 0) and isFirstColumnCheckboxes then begin
chk := 0;
callback.GetItemCheckedAt(row, col, chk);
Result := NSNumber.numberWithInt(chk);
Exit;
end;
txt := '';
if callback.GetItemTextAt(row, col, txt) then begin
if txt = '' then Result := NSString.string_
else Result := NSString.stringWithUTF8String(@txt[1])
end;
(*
if row > Items.Count-1 then begin
Result := nil;
Exit;
end;
if col = 0 then
StrResult := NSStringUTF8(Items.Strings[row])
else
begin
lStringList := TStringList(Items.Objects[row]);
StrResult := NSStringUTF8(lStringList.Strings[col-1]);
end;
Result := StrResult;
*)
end;
function TCocoaTableListView.tableView_shouldEditTableColumn_row(tableView: NSTableView; tableColumn: NSTableColumn; row: NSInteger): Boolean;
begin
Result := not readOnly;
@ -877,6 +834,51 @@ begin
Result := btn;
end;
function TCellCocoaTableListView.tableView_objectValueForTableColumn_row(
tableView: NSTableView; tableColumn: NSTableColumn; row: NSInteger): id;
var
lStringList: TStringList;
col: NSInteger;
StrResult: NSString;
chk : Integer;
txt : string;
begin
{$IFDEF COCOA_DEBUG_TABCONTROL}
WriteLn(Format('[TCocoaTableListView.tableView_objectValueForTableColumn_row] col=%d row=%d Items.Count=%d',
[col, row, Items.Count]));
{$ENDIF}
Result := nil;
if not Assigned(callback) then Exit;
col := getIndexOfColumn(tableColumn);
if (col = 0) and isFirstColumnCheckboxes then begin
chk := 0;
callback.GetItemCheckedAt(row, col, chk);
Result := NSNumber.numberWithInt(chk);
Exit;
end;
txt := '';
if callback.GetItemTextAt(row, col, txt) then begin
if txt = '' then Result := NSString.string_
else Result := NSString.stringWithUTF8String(@txt[1])
end;
(*
if row > Items.Count-1 then begin
Result := nil;
Exit;
end;
if col = 0 then
StrResult := NSStringUTF8(Items.Strings[row])
else
begin
lStringList := TStringList(Items.Objects[row]);
StrResult := NSStringUTF8(lStringList.Strings[col-1]);
end;
Result := StrResult;
*)
end;
{ TCocoaTableListItem }
function TCocoaTableListItem.initWithFrame(frameRect: NSRect): id;