summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgraemeg <graemeg@ae50a9b5-8222-0410-bf8d-8a13f76226bf>2008-07-16 06:51:31 +0000
committergraemeg <graemeg@ae50a9b5-8222-0410-bf8d-8a13f76226bf>2008-07-16 06:51:31 +0000
commit6272816b16c7de17709e204b2ec53fe95bae7fa1 (patch)
tree9a015eb4191c7a1c4e1e4329c725353dce675a39
parent3f05644af4c92b4c483fefb00a9c7f8fe9ad552d (diff)
downloadfpGUI-6272816b16c7de17709e204b2ec53fe95bae7fa1.tar.xz
* Applied Vladimir's GetClientRect patch.
-rw-r--r--src/corelib/gfx_widget.pas6
-rw-r--r--src/gui/gui_listview.pas2
-rw-r--r--src/gui/gui_panel.pas8
-rw-r--r--src/gui/gui_splitter.pas2
4 files changed, 9 insertions, 9 deletions
diff --git a/src/corelib/gfx_widget.pas b/src/corelib/gfx_widget.pas
index eb5577d5..0598b37c 100644
--- a/src/corelib/gfx_widget.pas
+++ b/src/corelib/gfx_widget.pas
@@ -112,7 +112,7 @@ type
public
constructor Create(AOwner: TComponent); override;
destructor Destroy; override;
- function GetClientBounds: TfpgRect; virtual;
+ function GetClientRect: TfpgRect; virtual;
function GetBoundsRect: TfpgRect; virtual;
procedure Realign;
procedure SetFocus;
@@ -252,7 +252,7 @@ begin
end;
end;
-function TfpgWidget.GetClientBounds: TfpgRect;
+function TfpgWidget.GetClientRect: TfpgRect;
begin
Result.SetRect(0, 0, Width, Height);
end;
@@ -964,7 +964,7 @@ begin
if (csLoading in ComponentState) then
Exit; //==>
// writeln('HandleAlignments - ', Classname);
- FAlignRect := GetClientBounds;
+ FAlignRect := GetClientRect;
DoAlign(alTop);
DoAlign(alBottom);
diff --git a/src/gui/gui_listview.pas b/src/gui/gui_listview.pas
index 74b9bdb3..7ed15fed 100644
--- a/src/gui/gui_listview.pas
+++ b/src/gui/gui_listview.pas
@@ -205,7 +205,6 @@ type
procedure ItemChanged(AIndex: Integer);
procedure ItemsUpdated;
//
- function GetClientRect: TfpgRect;
function GetVisibleColumnsWidth: Integer;
function GetItemAreaHeight: Integer;
procedure StartShiftSelection;
@@ -240,6 +239,7 @@ type
public
constructor Create(AOwner: TComponent); override;
destructor Destroy; override;
+ function GetClientRect: TfpgRect; override;
procedure BeginUpdate;
procedure EndUpdate;
procedure MakeItemVisible(AIndex: Integer; PartialOK: Boolean = False);
diff --git a/src/gui/gui_panel.pas b/src/gui/gui_panel.pas
index 474bb4ff..f986ff58 100644
--- a/src/gui/gui_panel.pas
+++ b/src/gui/gui_panel.pas
@@ -44,7 +44,7 @@ type
FPanelShape: TPanelShape;
FPanelStyle: TPanelStyle;
FPanelBorder: TPanelBorder;
- function GetClientBounds: TfpgRect; override;
+ function GetClientRect: TfpgRect; override;
procedure SetPanelStyle(const AValue: TPanelStyle);
procedure SetPanelBorder(const AValue: TPanelBorder);
protected
@@ -134,7 +134,7 @@ type
procedure SetMargin(const AValue: integer);
protected
FFont: TfpgFont;
- function GetClientBounds: TfpgRect; override;
+ function GetClientRect: TfpgRect; override;
procedure HandlePaint; override;
public
constructor Create(AOwner: TComponent); override;
@@ -212,7 +212,7 @@ end;
{TfpgAbstractPanel}
-function TfpgAbstractPanel.GetClientBounds: TfpgRect;
+function TfpgAbstractPanel.GetClientRect: TfpgRect;
begin
Result.SetRect(2, 2, Width - 4, Height - 4);
end;
@@ -571,7 +571,7 @@ begin
end;
end;
-function TfpgGroupBox.GetClientBounds: TfpgRect;
+function TfpgGroupBox.GetClientRect: TfpgRect;
var
h: integer;
begin
diff --git a/src/gui/gui_splitter.pas b/src/gui/gui_splitter.pas
index ed0b6039..0c204ab0 100644
--- a/src/gui/gui_splitter.pas
+++ b/src/gui/gui_splitter.pas
@@ -309,7 +309,7 @@ var
lRect: TfpgRect;
begin
Canvas.SetColor(clWindowBackground);
- Canvas.FillRectangle(GetClientBounds);
+ Canvas.FillRectangle(GetClientRect);
case Align of
alRight,