From 130bc8c66054721dfb1193c9dff2b15c8f2a7943 Mon Sep 17 00:00:00 2001 From: graemeg Date: Mon, 22 Oct 2007 15:04:19 +0000 Subject: * Fixed more default property values. --- examples/apps/uidesigner/newformdesigner.pas | 3 ++- examples/apps/uidesigner/vfdwidgets.pas | 2 +- src/gui/gui_button.pas | 13 +++++++------ 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/examples/apps/uidesigner/newformdesigner.pas b/examples/apps/uidesigner/newformdesigner.pas index 713c6564..a3193b4e 100644 --- a/examples/apps/uidesigner/newformdesigner.pas +++ b/examples/apps/uidesigner/newformdesigner.pas @@ -841,7 +841,8 @@ end; procedure TwgPropertyList.HandleKillFocus; begin inherited HandleKillFocus; - Editor.Visible := True; + if Editor <> nil then + Editor.Visible := True; end; procedure TwgPropertyList.RealignEditor; diff --git a/examples/apps/uidesigner/vfdwidgets.pas b/examples/apps/uidesigner/vfdwidgets.pas index 416d77e7..f799f41b 100644 --- a/examples/apps/uidesigner/vfdwidgets.pas +++ b/examples/apps/uidesigner/vfdwidgets.pas @@ -212,7 +212,7 @@ begin wc := TVFDWidgetClass.Create(TfpgForm); wc.NameBase := 'frm'; wc.AddProperty('WindowTitle', TPropertyString, ''); - wc.AddProperty('WindowPosition', TPropertyEnum, ''); +// wc.AddProperty('WindowPosition', TPropertyEnum, ''); FVFDFormWidget := wc; // Label diff --git a/src/gui/gui_button.pas b/src/gui/gui_button.pas index 723349ed..ff29a385 100644 --- a/src/gui/gui_button.pas +++ b/src/gui/gui_button.pas @@ -80,14 +80,14 @@ type property AllowDown: Boolean read GetAllowDown write SetAllowDown; published property Text: string read FText write SetText; - property Default: boolean read FDefault write SetDefault; + property Default: boolean read FDefault write SetDefault default False; property FontDesc: string read GetFontDesc write SetFontDesc; property ImageName: string read FImageName write SetImageName; - property ImageMargin: integer read FImageMargin write SetImageMargin; - property ImageSpacing: integer read FImageSpacing write SetImageSpacing; - property GroupIndex: integer read FGroupIndex write FGroupIndex; - property AllowAllUp: boolean read FAllowAllUp write SetAllowAllUp; - property ModalResult: integer read FModalResult write FModalResult; + property ImageMargin: integer read FImageMargin write SetImageMargin default 3; + property ImageSpacing: integer read FImageSpacing write SetImageSpacing default -1; + property GroupIndex: integer read FGroupIndex write FGroupIndex default 0; + property AllowAllUp: boolean read FAllowAllUp write SetAllowAllUp default False; + property ModalResult: integer read FModalResult write FModalResult default 0; property Embedded: Boolean read FEmbedded write SetEmbedded default False; property ShowImage: Boolean read FShowImage write SetShowImage default True; end; @@ -212,6 +212,7 @@ begin FModalResult := 0; FEmbedded := False; FDefault := False; + FAllowAllUp := False; end; destructor TfpgButton.Destroy; -- cgit v1.2.3-70-g09d2