pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

rx component: fixed compilation with fpc 2.3.1 and lazarus 0.9.23.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@233 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
vsnijders
2007-08-09 21:53:05 +00:00
parent a3d4d0d2fd
commit 3b3bbb969c
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
components/rx/rxdbgrid.pas
View File

@ -336,7 +336,7 @@ end;
function TRxDBGrid.GetColumns: TRxDbGridColumns; function TRxDBGrid.GetColumns: TRxDbGridColumns;
begin begin
result := TRxDbGridColumns(TCustomGrid(Self).Columns); result := TRxDbGridColumns(inherited Columns);
end; end;
function TRxDBGrid.GetPropertyStorage: TCustomPropertyStorage; function TRxDBGrid.GetPropertyStorage: TCustomPropertyStorage;
@ -346,12 +346,12 @@ end;
function TRxDBGrid.IsColumnsStored: boolean; function TRxDBGrid.IsColumnsStored: boolean;
begin begin
result := TRxDbGridColumns(TCustomGrid(Self).Columns).Enabled; result := TRxDbGridColumns(inherited Columns).Enabled;
end; end;
procedure TRxDBGrid.SetColumns(const AValue: TRxDbGridColumns); procedure TRxDBGrid.SetColumns(const AValue: TRxDbGridColumns);
begin begin
TRxDbGridColumns(TCustomGrid(Self).Columns).Assign(Avalue); TRxDbGridColumns(inherited Columns).Assign(Avalue);
end; end;
procedure TRxDBGrid.SetPropertyStorage(const AValue: TCustomPropertyStorage); procedure TRxDBGrid.SetPropertyStorage(const AValue: TCustomPropertyStorage);

10
components/rx/rxlogin.pas
View File

@ -454,22 +454,22 @@ end;
procedure TRxLoginDialog.OkButtonClick(Sender: TObject); procedure TRxLoginDialog.OkButtonClick(Sender: TObject);
var var
SetCursor: Boolean; ChangeCursor: Boolean;
begin begin
with TRxLoginForm(Sender) do begin with TRxLoginForm(Sender) do begin
{$IFDEF WIN32} {$IFDEF WIN32}
SetCursor := GetCurrentThreadID = MainThreadID; ChangeCursor := GetCurrentThreadID = MainThreadID;
{$ELSE} {$ELSE}
SetCursor := True; ChangeCursor := True;
{$ENDIF} {$ENDIF}
try try
if SetCursor then Screen.Cursor := crHourGlass; if ChangeCursor then Screen.Cursor := crHourGlass;
try try
if DoCheckUser(UserNameEdit.Text, PasswordEdit.Text) then if DoCheckUser(UserNameEdit.Text, PasswordEdit.Text) then
ModalResult := mrOk ModalResult := mrOk
else ModalResult := mrNone; else ModalResult := mrNone;
finally finally
if SetCursor then Screen.Cursor := crDefault; if ChangeCursor then Screen.Cursor := crDefault;
end; end;
except except
Application.HandleException(Self); Application.HandleException(Self);

2
components/rx/rxtoolbar.pas
View File

@ -61,7 +61,7 @@ type
procedure UpdateSize; procedure UpdateSize;
procedure SetEnabled(NewEnabled: boolean); override; procedure SetEnabled(NewEnabled: boolean); override;
function GetActionLinkClass: TControlActionLinkClass; override; function GetActionLinkClass: TControlActionLinkClass; override;
function GetDrawFlags: integer; override; function GetDrawFlags: integer; virtual;
public public
procedure SetBounds(aLeft, aTop, aWidth, aHeight: integer); override; procedure SetBounds(aLeft, aTop, aWidth, aHeight: integer); override;
destructor Destroy; override; destructor Destroy; override;