paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-16 23:49:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

readded protected TWinControl.BorderStyle

Browse Source 
git-svn-id: trunk@5497 -
This commit is contained in:
mattias 2004-05-21 18:34:44 +00:00
parent 5d9f229457
commit d4265baaa0
7 changed files with 52 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lcl/comctrls.pp
View File

@ -527,7 +527,7 @@ type
property OnCompare: TLVCompareEvent read FOnCompare write FOnCompare;
property OnDeletion: TLVDeletedEvent read FOnDeletion write FOnDeletion;
property OnSelectItem: TLVSelectItemEvent read FOnSelectItem write FOnSelectItem;
property BorderStyle: TBorderStyle read GetBorderStyle write SetBorderStyle default bsSingle;
property BorderStyle default bsSingle;
public
constructor Create(Aowner: TComponent); override;
destructor Destroy; override;
@ -2254,6 +2254,9 @@ end.
{ =============================================================================
$Log$
Revision 1.129 2004/05/21 18:34:44 mattias
readded protected TWinControl.BorderStyle
Revision 1.128 2004/05/21 18:12:17 mattias
quick fixed crashing property overloading BorderStyle

13
lcl/controls.pp
View File

@ -1362,6 +1362,8 @@ type
procedure RemoveFocus(Removing: Boolean);
function RealGetText: TCaption; override;
procedure RealSetText(const Value: TCaption); override;
function GetBorderStyle: TBorderStyle;
procedure SetBorderStyle(NewStyle: TBorderStyle); virtual;
procedure UpdateControlState;
procedure CreateHandle; virtual;
procedure CreateWnd; virtual; //creates the window
@ -1408,10 +1410,8 @@ type
procedure SetZOrderPosition(NewPosition: Integer); override;
procedure SetZOrder(Topmost: Boolean); override;
procedure SendMoveSizeMessages(SizeChanged, PosChanged: boolean); override;
function GetBorderStyle: TBorderStyle;
procedure SetBorderStyle(NewStyle: TBorderStyle); virtual;
//property BorderStyle: TBorderStyle read GetBorderStyle write SetBorderStyle default bsNone;
protected
property BorderStyle: TBorderStyle read GetBorderStyle write SetBorderStyle default bsNone;
public
property BorderWidth: TBorderWidth read FBorderWidth write SetBorderWidth default 0;
property ChildSizing: TControlChildSizing read FChildSizing write SetChildSizing;
@ -1527,7 +1527,7 @@ type
procedure Paint; virtual;
property Canvas: TCanvas read FCanvas write FCanvas;
property BorderStyle: TBorderStyle read GetBorderStyle write SetBorderStyle default bsNone;
property BorderStyle;
end;
@ -2268,6 +2268,9 @@ end.
{ =============================================================================
$Log$
Revision 1.203 2004/05/21 18:34:44 mattias
readded protected TWinControl.BorderStyle
Revision 1.202 2004/05/21 18:12:17 mattias
quick fixed crashing property overloading BorderStyle

7
lcl/forms.pp
View File

@ -191,8 +191,7 @@ type
property AutoSize default True;
//property AutoScroll;
//property BiDiMode;
//property BorderStyle: TBorderStyle
// read FBorderStyle write SetBorderStyle default bsSingle;
property BorderStyle default bsSingle;
property Constraints;
//property DockSite;
property DragCursor;
@ -371,7 +370,7 @@ type
function IsKeyPreviewStored: boolean;
procedure SetActive(AValue: Boolean);
procedure SetActiveControl(AWinControl: TWinControl);
procedure SetFormBorderStyle(Value: TFormBorderStyle);
procedure SetFormBorderStyle(NewStyle: TFormBorderStyle);
procedure SetDesigner(Value : TIDesigner);
procedure SetFormStyle(Value : TFormStyle);
procedure SetIcon(AValue: TIcon);
@ -1052,7 +1051,7 @@ implementation
uses
WSControls, // Widgetset uses circle is allowed
WSForms, // Widgetset uses circle is allowed
Math;

12
lcl/include/customform.inc
View File

@ -974,15 +974,16 @@ end;
{------------------------------------------------------------------------------}
{ TCustomForm SetFormBorderStyle }
{------------------------------------------------------------------------------}
procedure TCustomForm.SetFormBorderStyle(Value: TFormBorderStyle);
procedure TCustomForm.SetFormBorderStyle(NewStyle: TFormBorderStyle);
begin
if FFormBorderStyle = Value then exit;
if FFormBorderStyle = NewStyle then exit;
//TODO: Finish SETBORDERSTYLE
FFormBorderStyle := Value;
FFormBorderStyle := NewStyle;
Include(FFormState,fsBorderStyleChanged);
// ToDo: implement it.
// We can not use inherited SetBorderStyle(Value),
// We can not use inherited SetBorderStyle(NewStyle),
// because TBorderSTyle <> TFormBorderSTyle;
TWSCustomFormClass(WidgetSetClass).SetFormBorderStyle(Self, NewStyle);
end;
{------------------------------------------------------------------------------}
@ -1605,6 +1606,9 @@ end;
{ =============================================================================
$Log$
Revision 1.139 2004/05/21 18:34:44 mattias
readded protected TWinControl.BorderStyle
Revision 1.138 2004/05/21 18:20:11 mattias
quick fixed crashing property overloading BorderStyle

12
lcl/interfaces/gtk/gtkwsforms.pp
View File

@ -77,6 +77,8 @@ type
private
protected
public
class procedure SetFormBorderStyle(const AWinControl: TWinControl;
const AFormBorderStyle: TFormBorderStyle); override;
end;
{ TGtkWSForm }
@ -114,6 +116,16 @@ type
implementation
{ TGtkWSCustomForm }
procedure TGtkWSCustomForm.SetFormBorderStyle(const AWinControl: TWinControl;
const AFormBorderStyle: TFormBorderStyle);
begin
inherited SetFormBorderStyle(AWinControl, AFormBorderStyle);
// the form border style can only be set at creation time.
// This is Delphi compatible, so no Recreatewnd needed.
end;
initialization
////////////////////////////////////////////////////

5
lcl/stdctrls.pp
View File

@ -400,7 +400,7 @@ type
public
property Align;
property Anchors;
property BorderStyle: TBorderStyle read GetBorderStyle write SetBorderStyle default bsSingle;
property BorderStyle default bsSingle;
property Canvas: TCanvas read FCanvas;
property Constraints;
property ExtendedSelect : boolean read FExtendedSelect write SetExtendedSelect;
@ -1549,6 +1549,9 @@ end.
{ =============================================================================
$Log$
Revision 1.145 2004/05/21 18:34:44 mattias
readded protected TWinControl.BorderStyle
Revision 1.144 2004/05/21 18:12:17 mattias
quick fixed crashing property overloading BorderStyle

15
lcl/widgetset/wsforms.pp
View File

@ -46,7 +46,7 @@ uses
////////////////////////////////////////////////////
// Forms,
////////////////////////////////////////////////////
WSLCLClasses, WSControls;
WSLCLClasses, WSControls, Forms, Controls;
type
{ TWSScrollingWinControl }
@ -72,7 +72,10 @@ type
{ TWSCustomForm }
TWSCustomForm = class(TWSScrollingWinControl)
class procedure SetFormBorderStyle(const AForm: TCustomForm;
const AFormBorderStyle: TFormBorderStyle); virtual;
end;
TWSCustomFormClass = class of TWSCustomForm;
{ TWSForm }
@ -97,6 +100,14 @@ type
implementation
{ TWSCustomForm }
procedure TWSCustomForm.SetFormBorderStyle(const AForm: TCustomForm;
const AFormBorderStyle: TFormBorderStyle);
begin
// will be done in interface override
end;
initialization
////////////////////////////////////////////////////
@ -107,7 +118,7 @@ initialization
// RegisterWSComponent(TScrollBox, TWSScrollBox);
// RegisterWSComponent(TCustomFrame, TWSCustomFrame);
// RegisterWSComponent(TFrame, TWSFrame);
// RegisterWSComponent(TCustomForm, TWSCustomForm);
RegisterWSComponent(TCustomForm, TWSCustomForm);
// RegisterWSComponent(TForm, TWSForm);
// RegisterWSComponent(THintWindow, TWSHintWindow);
// RegisterWSComponent(TScreen, TWSScreen);