summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGraeme Geldenhuys <graeme@mastermaths.co.za>2009-11-30 17:02:28 +0200
committerGraeme Geldenhuys <graeme@mastermaths.co.za>2009-11-30 17:02:28 +0200
commitac63b48283ffc179a4c22af93282621064042a7f (patch)
tree9ae17408d1ad230f7993e1fd68c647b73e7882a6
parent7f11bfc51d540bce8c8097d729f0fcf8cefb0888 (diff)
downloadfpGUI-ac63b48283ffc179a4c22af93282621064042a7f.tar.xz
fixed compiler reported visibilty issues.
-rw-r--r--src/corelib/fpg_popupwindow.pas2
-rw-r--r--src/gui/fpg_form.pas4
-rw-r--r--src/gui/fpg_panel.pas2
-rw-r--r--src/gui/fpg_popupcalendar.pas5
-rw-r--r--src/gui/fpg_spinedit.pas16
5 files changed, 14 insertions, 15 deletions
diff --git a/src/corelib/fpg_popupwindow.pas b/src/corelib/fpg_popupwindow.pas
index fe7ef9d6..06207805 100644
--- a/src/corelib/fpg_popupwindow.pas
+++ b/src/corelib/fpg_popupwindow.pas
@@ -43,7 +43,6 @@ type
procedure SetPopupFrame(const AValue: boolean);
protected
procedure MsgClose(var msg: TfpgMessageRec); message FPGM_CLOSE;
- procedure AdjustWindowStyle; override;
procedure HandleClose; virtual;
procedure HandleShow; override;
procedure ProcessPopupFrame; virtual;
@@ -52,6 +51,7 @@ type
procedure DoOnShow; virtual;
public
constructor Create(AOwner: TComponent); override;
+ procedure AdjustWindowStyle; override;
procedure ShowAt(AWidget: TfpgWidget; x, y: TfpgCoord); overload;
procedure ShowAt(x, y: TfpgCoord); overload;
procedure Close; virtual;
diff --git a/src/gui/fpg_form.pas b/src/gui/fpg_form.pas
index a0a4c342..ee3bbe16 100644
--- a/src/gui/fpg_form.pas
+++ b/src/gui/fpg_form.pas
@@ -57,8 +57,6 @@ type
FWindowPosition: TWindowPosition;
FWindowTitle: string;
FSizeable: boolean;
- procedure AdjustWindowStyle; override;
- procedure SetWindowParameters; override;
procedure SetWindowTitle(const ATitle: string); override;
procedure MsgActivate(var msg: TfpgMessageRec); message FPGM_ACTIVATE;
procedure MsgDeActivate(var msg: TfpgMessageRec); message FPGM_DEACTIVATE;
@@ -94,6 +92,8 @@ type
procedure AfterConstruction; override;
procedure BeforeDestruction; override;
procedure AfterCreate; virtual;
+ procedure AdjustWindowStyle; override;
+ procedure SetWindowParameters; override;
procedure InvokeHelp; override;
procedure Show;
procedure Hide;
diff --git a/src/gui/fpg_panel.pas b/src/gui/fpg_panel.pas
index 28e2c722..e5a2e3f2 100644
--- a/src/gui/fpg_panel.pas
+++ b/src/gui/fpg_panel.pas
@@ -139,10 +139,10 @@ type
procedure SetMargin(const AValue: integer);
protected
FFont: TfpgFont;
- function GetClientRect: TfpgRect; override;
procedure HandlePaint; override;
public
constructor Create(AOwner: TComponent); override;
+ function GetClientRect: TfpgRect; override;
property Font: TfpgFont read FFont;
published
property Alignment: TAlignment read GetAlignment write SetAlignment default taLeftJustify;
diff --git a/src/gui/fpg_popupcalendar.pas b/src/gui/fpg_popupcalendar.pas
index a4c2fe94..d3e6388c 100644
--- a/src/gui/fpg_popupcalendar.pas
+++ b/src/gui/fpg_popupcalendar.pas
@@ -159,10 +159,10 @@ type
procedure SetDayColor(const AValue: TfpgColor);
procedure SetHolidayColor(const AValue: TfpgColor);
procedure SetSelectedColor(const AValue: TfpgColor);
- procedure SetText(const AValue: string); override;
- function GetText: string; override;
procedure SetCloseOnSelect(const AValue: boolean);
protected
+ function GetText: string; override;
+ procedure SetText(const AValue: string); override;
procedure InternalOnValueSet(Sender: TObject; const ADate: TDateTime); virtual;
function HasText: boolean; override;
procedure DoDropDown; override;
@@ -1029,7 +1029,6 @@ procedure TfpgCalendarCheckCombo.DoDrawText(const ARect: TfpgRect);
var
lRect: TfpgRect;
flags: TFTextFlags;
- lColor: TfpgColor;
begin
lRect := ARect;
lRect.Left := lRect.Left+FCheckBoxRect.Width + 1;
diff --git a/src/gui/fpg_spinedit.pas b/src/gui/fpg_spinedit.pas
index 280fa231..74ca2b01 100644
--- a/src/gui/fpg_spinedit.pas
+++ b/src/gui/fpg_spinedit.pas
@@ -151,6 +151,7 @@ type
property Value: extended read FValue write SetValue;
property Decimals: integer read GetDecimals write SetDecimals;
property FixedDecimals: Boolean read GetFixedDecimals write SetFixedDecimals;
+ property Hint;
property TabOrder;
property OnChange;
property OnEnter;
@@ -189,7 +190,7 @@ type
procedure SetIncrement(const AValue: integer);
procedure SetLargeIncrement(const AValue: integer);
procedure SetValue(const AValue: integer);
- procedure SetHint(const AValue: string);
+ procedure SetHint(const AValue: string); override;
procedure ButtonUpClick(Sender: TObject);
procedure ButtonDownClick(Sender: TObject);
procedure ButtonUpMouseDown(Sender: TObject; AButton: TMouseButton; AShift: TShiftState; const AMousePos: TPoint);
@@ -218,7 +219,7 @@ type
property Increment: integer read FIncrement write SetIncrement default 1;
property LargeIncrement: integer read FLargeIncrement write SetLargeIncrement default 10;
property Value: integer read FValue write SetValue default 0;
- property Hint: string read FHint write SetHint;
+ property Hint;
property TabOrder;
property OnChange;
property OnEnter;
@@ -1035,12 +1036,11 @@ end;
procedure TfpgSpinEdit.SetHint(const AValue: string);
begin
- if FHint <> AValue then
- begin
- FEdit.Hint := AValue;
- FButtonUp.Hint := AValue;
- FButtonDown.Hint := AValue;
- end;
+ inherited SetHint(AValue);
+ // let child component use the same hint
+ FEdit.Hint := AValue;
+ FButtonUp.Hint := AValue;
+ FButtonDown.Hint := AValue;
end;
procedure TfpgSpinEdit.ButtonUpClick(Sender: TObject);