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

fix fpc 1.0.x compilation

Browse Source 
git-svn-id: trunk@5987 -
This commit is contained in:
vincents 2004-09-12 20:59:05 +00:00
parent a3fbe1707a
commit 3aa5b946df
3 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lcl/comctrls.pp
View File

@ -402,10 +402,10 @@ type
procedure SetTabWidth(const AValue: Smallint);
protected
function CanChange: Boolean; dynamic;
function CanShowTab(TabIndex: Integer): Boolean; virtual;
function CanShowTab(ATabIndex: Integer): Boolean; virtual;
procedure Change; dynamic;
procedure DrawTab(TabIndex: Integer; const Rect: TRect; Active: Boolean); virtual;
function GetImageIndex(TabIndex: Integer): Integer; virtual;
procedure DrawTab(ATabIndex: Integer; const Rect: TRect; Active: Boolean); virtual;
function GetImageIndex(ATabIndex: Integer): Integer; virtual;
procedure Loaded; override;
procedure CreateWnd; override;
procedure DestroyHandle; override;
@ -2551,6 +2551,9 @@ end.
{ =============================================================================
$Log$
Revision 1.150 2004/09/12 20:59:05 vincents
fix fpc 1.0.x compilation
Revision 1.149 2004/09/10 16:28:50 mattias
implemented very rudimentary TTabControl

9
lcl/include/tabcontrol.inc
View File

@ -446,7 +446,7 @@ begin
FOnChanging(Self,Result);
end;
function TCustomTabControl.CanShowTab(TabIndex: Integer): Boolean;
function TCustomTabControl.CanShowTab(ATabIndex: Integer): Boolean;
begin
Result:=true;
end;
@ -463,7 +463,7 @@ begin
FOnChange(Self);
end;
procedure TCustomTabControl.DrawTab(TabIndex: Integer; const Rect: TRect;
procedure TCustomTabControl.DrawTab(ATabIndex: Integer; const Rect: TRect;
Active: Boolean);
begin
if Assigned(FOnDrawTab) then
@ -472,7 +472,7 @@ begin
Canvas.FillRect(Rect);
end;
function TCustomTabControl.GetImageIndex(TabIndex: Integer): Integer;
function TCustomTabControl.GetImageIndex(ATabIndex: Integer): Integer;
begin
Result:=TabIndex;
if Assigned(FOnGetImageIndex) then
@ -643,6 +643,9 @@ end;
{ =============================================================================
$Log$
Revision 1.5 2004/09/12 20:59:05 vincents
fix fpc 1.0.x compilation
Revision 1.4 2004/09/10 16:28:50 mattias
implemented very rudimentary TTabControl

8
lcl/interfaces/win32/win32wsmenus.pp
View File

@ -123,7 +123,11 @@ var
OldCheckmark := SelectObject(hdcNewBitmap, hbmpCheck);
OldTransBitmap := SelectObject(hdcTransBitmap, hbmpTrans);
// fill transparent-bitmap with transparent color
{$IFNDEF VER1_0}
rectBitmap := RECT(0, 0, bmpWidth, bmpHeight);
{$ELSE}
rectBitmap := Windows.Rect(RECT(0, 0, bmpWidth, bmpHeight));
{$ENDIF}
FillRect(hdcTransBitmap, rectBitmap, hbrTrans);
// blit menu icon transparently
TWin32WidgetSet(InterfaceObject).MaskBlt(hdcTransBitmap, 0, 0, bmpWidth,
@ -172,7 +176,11 @@ begin
if AMenuItem.Checked then fState:=fState or MFS_CHECKED;
fMask:=MIIM_ID or MIIM_DATA or MIIM_STATE or MIIM_TYPE;
wID:=AMenuItem.Command; {value may only be 16 bit wide!}
{$IFNDEF VER1_0}
dwItemData:=PtrInt(AMenuItem);
{$ELSE}
dwItemData:=Integer(AMenuItem);
{$ENDIF}
// Note: can't use "and MFT_STRING", because MFT_STRING is zero :-)
if (AMenuItem.Count > 0) then
begin