← Back to branch summary

~ubuntu-branches/ubuntu/vivid/lazarus/vivid

« back to all changes in this revision

Viewing changes to lcl/interfaces/carbon/carbonstrings.pp

  • Committer: Package Import Robot
  • Author(s): Abou Al Montacir
  • Date: 2014-05-15 23:17:51 UTC
  • mfrom: (1.1.13)
  • Revision ID: package-import@ubuntu.com-20140515231751-gumj9a01g0ghm7ac
Tags: 1.2.2+dfsg-1
* New upstream release with few fixes and official support of FPC 2.6.4.
  - The detailed list of changes can be found here:
  http://wiki.lazarus.freepascal.org/Lazarus_1.2_fixes_branch#Fixes_for_1.2.2_.28Merged.29

Show diffs side-by-side

added added

removed removed

Lines of Context:
lcl/interfaces/carbon/carbonstrings.pp
18
18
// defines
19
19
{$I carbondefines.inc}
20
20
 
 
21
{$if (FPC_FULLVERSION>=20701) OR (FPC_FULLVERSION>=20603)}
 
22
{$define HAS_INHERITED_INSERTITEM}
 
23
{$endif}
 
24
 
21
25
uses
22
26
 // rtl+ftl
23
27
  Classes, SysUtils,
34
38
    FOwner: TCarbonComboBox;  // Carbon combo box control owning strings
35
39
  protected
36
40
    procedure Put(Index: Integer; const S: string); override;
37
 
    {$IF FPC_FULLVERSION<20701}
 
41
    {$IFNDEF HAS_INHERITED_INSERTITEM}
38
42
    // before fpc 2.7.1 InsertItem(Index,S) did not call InsertItem(Index,S,nil)
39
43
    procedure InsertItem(Index: Integer; const S: string); override;
40
44
    {$ENDIF}
57
61
    FWinControl: TWinControl;
58
62
  protected
59
63
    procedure Put(Index: Integer; const S: string); override;
 
64
    {$IFNDEF HAS_INHERITED_INSERTITEM}
 
65
    // before fpc 2.7.1 InsertItem(Index,S) did not call InsertItem(Index,S,nil)
60
66
    procedure InsertItem(Index: Integer; const S: string); override;
 
67
    {$ENDIF}
61
68
    procedure InsertItem(Index: Integer; const S: string; O: TObject); override;
62
69
  public
63
70
    constructor Create(AOwner: TCarbonListBox; AWinControl: TWinControl);
113
120
  FOwner.Insert(Index, S);
114
121
end;
115
122
 
116
 
{$IF FPC_FULLVERSION<20701}
 
123
{$IFNDEF HAS_INHERITED_INSERTITEM}
117
124
{------------------------------------------------------------------------------
118
125
  Method:  TCarbonComboBoxStrings.InsertItem
119
126
  Params:  Index - Line index
228
235
  FOwner.UpdateItem(Index);
229
236
end;
230
237
 
 
238
{$IFNDEF HAS_INHERITED_INSERTITEM}
231
239
{------------------------------------------------------------------------------
232
240
  Method:  TCarbonListBoxStrings.InsertItem
233
241
  Params:  Index - Line index
241
249
 
242
250
  FOwner.InsertItem(Index);
243
251
end;
 
252
{$ENDIF}
244
253
 
245
254
{------------------------------------------------------------------------------
246
255
  Method:  TCarbonListBoxStrings.InsertItem