summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/gui_edit.pas9
-rw-r--r--src/gui/gui_form.pas2
2 files changed, 5 insertions, 6 deletions
diff --git a/src/gui/gui_edit.pas b/src/gui/gui_edit.pas
index ccfe5418..278442ad 100644
--- a/src/gui/gui_edit.pas
+++ b/src/gui/gui_edit.pas
@@ -33,8 +33,6 @@ type
TfpgEditBorderStyle = (bsNone, bsDefault, bsSingle);
- { TfpgCustomEdit }
-
TfpgCustomEdit = class(TfpgWidget)
private
FAutoSelect: Boolean;
@@ -115,6 +113,7 @@ type
TfpgEdit = class(TfpgCustomEdit)
public
+ property Font;
property PopupMenu; // UI Designer doesn't fully support it yet
published
property AutoSelect;
@@ -137,8 +136,6 @@ type
end;
- { TfpgBaseNumericEdit }
-
TfpgBaseNumericEdit = class(TfpgCustomEdit)
private
fOldColor: TfpgColor;
@@ -237,7 +234,8 @@ begin
Result := TfpgEdit.Create(AOwner);
Result.Left := x;
Result.Top := y;
- Result.Width := w;
+ if w > 0 then
+ Result.Width := w;
if h < TfpgEdit(Result).FFont.Height + 6 then
Result.Height:= TfpgEdit(Result).FFont.Height + 6
else
@@ -404,7 +402,6 @@ begin
Canvas.SetFont(FFont);
Canvas.SetTextColor(FTextColor);
- // fpgStyle.DrawString(Canvas, -FTextOffset + FSideMargin, 3, dtext, Enabled);
fpgStyle.DrawString(Canvas, -FDrawOffset + FSideMargin, 3, FVisibleText, Enabled);
if Focused then
diff --git a/src/gui/gui_form.pas b/src/gui/gui_form.pas
index ea68397b..d4a1ec18 100644
--- a/src/gui/gui_form.pas
+++ b/src/gui/gui_form.pas
@@ -85,6 +85,7 @@ type
property TextColor;
property WindowPosition: TWindowPosition read FWindowPosition write FWindowPosition default wpAuto;
property WindowTitle: string read FWindowTitle write SetWindowTitle;
+ // events
property OnActivate: TNotifyEvent read FOnActivate write FOnActivate;
property OnClose: TFormCloseEvent read FOnClose write FOnClose;
property OnCloseQuery: TFormCloseQueryEvent read FOnCloseQuery write FOnCloseQuery;
@@ -93,6 +94,7 @@ type
property OnDestroy: TNotifyEvent read FOnDestroy write FOnDestroy;
property OnHide: TNotifyEvent read FOnHide write FOnHide;
property OnPaint;
+ property OnResize;
property OnShow: TNotifyEvent read FOnShow write FOnShow;
end;