diff --git a/lcl/comctrls.pp b/lcl/comctrls.pp index 51769a80dd..8d9f7b0d53 100644 --- a/lcl/comctrls.pp +++ b/lcl/comctrls.pp @@ -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 diff --git a/lcl/include/tabcontrol.inc b/lcl/include/tabcontrol.inc index 83101507fb..e81354a24b 100644 --- a/lcl/include/tabcontrol.inc +++ b/lcl/include/tabcontrol.inc @@ -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 diff --git a/lcl/interfaces/win32/win32wsmenus.pp b/lcl/interfaces/win32/win32wsmenus.pp index b198483cc3..85be4b5e97 100644 --- a/lcl/interfaces/win32/win32wsmenus.pp +++ b/lcl/interfaces/win32/win32wsmenus.pp @@ -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