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

can only introduce virtual methods in TWSWinControl; quick fix

Browse Source 
git-svn-id: trunk@7372 -
This commit is contained in:
micha 2005-07-18 19:31:53 +00:00
parent 4d1f460836
commit 8f21b33cd7
5 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lcl/interfaces/win32/win32wscalendar.pp
View File

@ -48,7 +48,7 @@ type
class function CreateHandle(const AWinControl: TWinControl; class function CreateHandle(const AWinControl: TWinControl;
const AParams: TCreateParams): HWND; override; const AParams: TCreateParams): HWND; override;
class procedure AdaptBounds(const AWinControl: TWinControl; class procedure AdaptBounds(const AWinControl: TWinControl;
var Left, Top, Width, Height: integer; var SuppressMove: boolean); var Left, Top, Width, Height: integer; var SuppressMove: boolean); override;
class function GetDateTime(const ACalendar: TCustomCalendar): TDateTime; override; class function GetDateTime(const ACalendar: TCustomCalendar): TDateTime; override;
class procedure SetDateTime(const ACalendar: TCustomCalendar; const ADateTime: TDateTime); override; class procedure SetDateTime(const ACalendar: TCustomCalendar; const ADateTime: TDateTime); override;
class procedure SetDisplaySettings(const ACalendar: TCustomCalendar; const ASettings: TDisplaySettings); override; class procedure SetDisplaySettings(const ACalendar: TCustomCalendar; const ASettings: TDisplaySettings); override;

7
lcl/interfaces/win32/win32wscontrols.pp
View File

@ -66,8 +66,6 @@ type
protected protected
public public
class procedure AddControl(const AControl: TControl); override; class procedure AddControl(const AControl: TControl); override;
class procedure AdaptBounds(const AWinControl: TWinControl;
var Left, Top, Width, Height: integer; var SuppressMove: boolean); virtual;
class function GetText(const AWinControl: TWinControl; var AText: String): Boolean; override; class function GetText(const AWinControl: TWinControl; var AText: String): Boolean; override;
class procedure SetBounds(const AWinControl: TWinControl; const ALeft, ATop, AWidth, AHeight: Integer); override; class procedure SetBounds(const AWinControl: TWinControl; const ALeft, ATop, AWidth, AHeight: Integer); override;
@ -314,11 +312,6 @@ begin
SetParent(ChildHandle, ParentHandle); SetParent(ChildHandle, ParentHandle);
end; end;
procedure TWin32WSWinControl.AdaptBounds(const AWinControl: TWinControl;
var Left, Top, Width, Height: integer; var SuppressMove: boolean);
begin
end;
function TWin32WSWinControl.GetText(const AWinControl: TWinControl; var AText: String): Boolean; function TWin32WSWinControl.GetText(const AWinControl: TWinControl; var AText: String): Boolean;
begin begin
AText := ''; AText := '';

10
lcl/interfaces/win32/win32wsspin.pp
View File

@ -46,8 +46,8 @@ type
private private
protected protected
public public
class function AdaptBounds(const AWinControl: TWinControl; class procedure AdaptBounds(const AWinControl: TWinControl;
var Left, Top, Width, Height: integer): boolean; var Left, Top, Width, Height: integer; var SuppressMove: boolean); override;
class function CreateHandle(const AWinControl: TWinControl; class function CreateHandle(const AWinControl: TWinControl;
const AParams: TCreateParams): HWND; override; const AParams: TCreateParams): HWND; override;
class function GetSelStart(const ACustomSpinEdit: TCustomSpinEdit): integer; override; class function GetSelStart(const ACustomSpinEdit: TCustomSpinEdit): integer; override;
@ -117,8 +117,8 @@ begin
Result := Params.Window; Result := Params.Window;
end; end;
function TWin32WSCustomSpinEdit.AdaptBounds(const AWinControl: TWinControl; procedure TWin32WSCustomSpinEdit.AdaptBounds(const AWinControl: TWinControl;
var Left, Top, Width, Height: integer): boolean; var Left, Top, Width, Height: integer; var SuppressMove: boolean);
var var
WinHandle, BuddyHandle: HWND; WinHandle, BuddyHandle: HWND;
begin begin
@ -128,7 +128,7 @@ begin
MoveWindow(BuddyHandle, Left, Top, Width, Height, True); MoveWindow(BuddyHandle, Left, Top, Width, Height, True);
// reattach // reattach
Windows.SendMessage(WinHandle, UDM_SETBUDDY, BuddyHandle, 0); Windows.SendMessage(WinHandle, UDM_SETBUDDY, BuddyHandle, 0);
Result := true; SuppressMove := true;
end; end;
function TWin32WSCustomSpinEdit.GetSelStart(const ACustomSpinEdit: TCustomSpinEdit): integer; function TWin32WSCustomSpinEdit.GetSelStart(const ACustomSpinEdit: TCustomSpinEdit): integer;

4
lcl/interfaces/win32/win32wsstdctrls.pp
View File

@ -60,7 +60,7 @@ type
class function CreateHandle(const AWinControl: TWinControl; class function CreateHandle(const AWinControl: TWinControl;
const AParams: TCreateParams): HWND; override; const AParams: TCreateParams): HWND; override;
class procedure AdaptBounds(const AWinControl: TWinControl; class procedure AdaptBounds(const AWinControl: TWinControl;
var Left, Top, Width, Height: integer; var SuppressMove: boolean); var Left, Top, Width, Height: integer; var SuppressMove: boolean); override;
end; end;
{ TWin32WSGroupBox } { TWin32WSGroupBox }
@ -80,7 +80,7 @@ type
class function CreateHandle(const AWinControl: TWinControl; class function CreateHandle(const AWinControl: TWinControl;
const AParams: TCreateParams): HWND; override; const AParams: TCreateParams): HWND; override;
class procedure AdaptBounds(const AWinControl: TWinControl; class procedure AdaptBounds(const AWinControl: TWinControl;
var Left, Top, Width, Height: integer; var SuppressMove: boolean); var Left, Top, Width, Height: integer; var SuppressMove: boolean); override;
class function GetSelStart(const ACustomComboBox: TCustomComboBox): integer; 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 GetItemIndex(const ACustomComboBox: TCustomComboBox): integer; override;

8
lcl/widgetset/wscontrols.pp
View File

@ -86,6 +86,9 @@ type
class procedure SetSize(const AWinControl: TWinControl; const AWidth, AHeight: Integer); virtual; class procedure SetSize(const AWinControl: TWinControl; const AWidth, AHeight: Integer); virtual;
class procedure SetText(const AWinControl: TWinControl; const AText: String); virtual; class procedure SetText(const AWinControl: TWinControl; const AText: String); virtual;
{ TODO: this procedure is only used in win32 interface }
class procedure AdaptBounds(const AWinControl: TWinControl;
var Left, Top, Width, Height: integer; var SuppressMove: boolean); virtual;
class procedure ConstraintsChange(const AWinControl: TWinControl); virtual; class procedure ConstraintsChange(const AWinControl: TWinControl); virtual;
class function CreateHandle(const AWinControl: TWinControl; class function CreateHandle(const AWinControl: TWinControl;
const AParams: TCreateParams): TLCLIntfHandle; virtual; const AParams: TCreateParams): TLCLIntfHandle; virtual;
@ -126,6 +129,11 @@ end;
{ TWSWinControl } { TWSWinControl }
procedure TWSWinControl.AdaptBounds(const AWinControl: TWinControl;
var Left, Top, Width, Height: integer; var SuppressMove: boolean);
begin
end;
procedure TWSWinControl.ConstraintsChange(const AWinControl: TWinControl); procedure TWSWinControl.ConstraintsChange(const AWinControl: TWinControl);
begin begin
end; end;