From 3b3bbb969ccbb28c8b387a5692fba29dd5efb9c3 Mon Sep 17 00:00:00 2001
From: vsnijders <vsnijders@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Thu, 9 Aug 2007 21:53:05 +0000
Subject: [PATCH] rx component: fixed compilation with fpc 2.3.1 and lazarus
 0.9.23.

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@233 8e941d3f-bd1b-0410-a28a-d453659cc2b4
---
 components/rx/rxdbgrid.pas  |  6 +++---
 components/rx/rxlogin.pas   | 10 +++++-----
 components/rx/rxtoolbar.pas |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/components/rx/rxdbgrid.pas b/components/rx/rxdbgrid.pas
index 2e924c287..174adbcf7 100644
--- a/components/rx/rxdbgrid.pas
+++ b/components/rx/rxdbgrid.pas
@@ -336,7 +336,7 @@ end;
 
 function TRxDBGrid.GetColumns: TRxDbGridColumns;
 begin
-  result := TRxDbGridColumns(TCustomGrid(Self).Columns);
+  result := TRxDbGridColumns(inherited Columns);
 end;
 
 function TRxDBGrid.GetPropertyStorage: TCustomPropertyStorage;
@@ -346,12 +346,12 @@ end;
 
 function TRxDBGrid.IsColumnsStored: boolean;
 begin
-  result := TRxDbGridColumns(TCustomGrid(Self).Columns).Enabled;
+  result := TRxDbGridColumns(inherited Columns).Enabled;
 end;
 
 procedure TRxDBGrid.SetColumns(const AValue: TRxDbGridColumns);
 begin
-  TRxDbGridColumns(TCustomGrid(Self).Columns).Assign(Avalue);
+  TRxDbGridColumns(inherited Columns).Assign(Avalue);
 end;
 
 procedure TRxDBGrid.SetPropertyStorage(const AValue: TCustomPropertyStorage);
diff --git a/components/rx/rxlogin.pas b/components/rx/rxlogin.pas
index 8ea03544a..a5ad7c298 100644
--- a/components/rx/rxlogin.pas
+++ b/components/rx/rxlogin.pas
@@ -454,22 +454,22 @@ end;
 
 procedure TRxLoginDialog.OkButtonClick(Sender: TObject);
 var
-  SetCursor: Boolean;
+  ChangeCursor: Boolean;
 begin
   with TRxLoginForm(Sender) do begin
 {$IFDEF WIN32}
-    SetCursor := GetCurrentThreadID = MainThreadID;
+    ChangeCursor := GetCurrentThreadID = MainThreadID;
 {$ELSE}
-    SetCursor := True;
+    ChangeCursor := True;
 {$ENDIF}
     try
-      if SetCursor then Screen.Cursor := crHourGlass;
+      if ChangeCursor then Screen.Cursor := crHourGlass;
       try
         if DoCheckUser(UserNameEdit.Text, PasswordEdit.Text) then
           ModalResult := mrOk
         else ModalResult := mrNone;
       finally
-        if SetCursor then Screen.Cursor := crDefault;
+        if ChangeCursor then Screen.Cursor := crDefault;
       end;
     except
       Application.HandleException(Self);
diff --git a/components/rx/rxtoolbar.pas b/components/rx/rxtoolbar.pas
index f022362ee..28e7bb748 100644
--- a/components/rx/rxtoolbar.pas
+++ b/components/rx/rxtoolbar.pas
@@ -61,7 +61,7 @@ type
     procedure UpdateSize;
     procedure SetEnabled(NewEnabled: boolean); override;
     function GetActionLinkClass: TControlActionLinkClass; override;
-    function GetDrawFlags: integer; override;
+    function GetDrawFlags: integer; virtual;
   public
     procedure SetBounds(aLeft, aTop, aWidth, aHeight: integer); override;
     destructor Destroy; override;