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

RxFPC:fix compile rxtools on windows

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@4637 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
alexs75
2016-05-05 06:22:50 +00:00
parent 631f9bf1b1
commit fdbf8a6f0b
4 changed files with 32 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
components/rx/trunk/rxdbgrid.pas
View File

@ -181,11 +181,13 @@ type
private
FActive: boolean;
FColor: TColor;
FDrawFullLine: boolean;
FOwner: TRxDBGrid;
FRowCount: integer;
FStyle: TTitleStyle;
procedure SetActive(AValue: boolean);
procedure SetColor(AValue: TColor);
procedure SetDrawFullLine(AValue: boolean);
procedure SetRowCount(AValue: integer);
procedure SetStyle(AValue: TTitleStyle);
protected
@ -198,6 +200,7 @@ type
property Color: TColor read FColor write SetColor default clWindow;
property RowCount: integer read FRowCount write SetRowCount default 0;
property Style: TTitleStyle read FStyle write SetStyle default tsLazarus;
property DrawFullLine: boolean read FDrawFullLine write SetDrawFullLine;
end;
{ TRxDBGridColumnDefValues }
@ -571,7 +574,6 @@ type
FPressed: boolean;
FSwapButtons: boolean;
FTracking: boolean;
FDrawFullLine: boolean;
F_Clicked: boolean;
F_PopupMenu: TPopupMenu;
@ -1864,6 +1866,12 @@ begin
FOwner.Invalidate;
end;
procedure TRxDBGridFooterOptions.SetDrawFullLine(AValue: boolean);
begin
if FDrawFullLine=AValue then Exit;
FDrawFullLine:=AValue;
end;
procedure TRxDBGridFooterOptions.SetRowCount(AValue: integer);
begin
if FRowCount=AValue then Exit;

22
components/rx/trunk/rxfileutils.pas
View File

@ -44,13 +44,15 @@ function NormalizeDirectoryName(const DirName:string):string;
function GetUserName:string;
implementation
uses
{$IFDEF WINDOWS}
Windows,
Windows;
{$ELSE}
{$ENDIF}
(*
FileUtil, LazFileUtils, LazUTF8;
*)
{$IF DEFINED(WINDOWS) AND NOT DEFINED(WINCE)}
function LStrError(const Ernum: Longint; const UseUTF8: Boolean = False): string;
const
@ -141,8 +143,9 @@ var
S:string;
begin
{$IF DEFINED(WINDOWS) AND NOT DEFINED(WINCE)}
GetFileNameOwner(UTF8ToSys(SearchDomain), UTF8ToSys(FileName), Result, S);
Result:=UTF8Encode(Result);
(* GetFileNameOwner(UTF8ToSys(SearchDomain), UTF8ToSys(FileName), Result, S);
Result:=UTF8Encode(Result);*)
GetFileNameOwner(SearchDomain, FileName, Result, S);
{$ELSE}
Result:='';
{$ENDIF}
@ -152,9 +155,10 @@ procedure GetFileOwnerData(const SearchDomain, FileName: String; out UserName,
DomainName: string);
begin
{$IF DEFINED(WINDOWS) AND NOT DEFINED(WINCE)}
GetFileNameOwner(UTF8ToSys(SearchDomain), UTF8ToSys(FileName), UserName, DomainName);
{ GetFileNameOwner(UTF8ToSys(SearchDomain), UTF8ToSys(FileName), UserName, DomainName);
UserName:=UTF8Encode(UserName);
DomainName:=UTF8Encode(DomainName);
DomainName:=UTF8Encode(DomainName);}
GetFileNameOwner(SearchDomain, FileName, UserName, DomainName);
{$ELSE}
UserName:='';
DomainName:='';
@ -184,10 +188,12 @@ begin
L:=SizeOf(A)-1;
if Windows.GetUserNameA(@A, L) then
begin
Result:=SysToUTF8(StrPas(@A));
(* Result:=SysToUTF8(StrPas(@A)); *)
Result:=StrPas(@A);
end
else
Result:=GetEnvironmentVariableUTF8('USERNAME');
(*Result:=GetEnvironmentVariableUTF8('USERNAME');*)
Result:=SysUtils.GetEnvironmentVariable('USERNAME');
{$ELSE}
Result:=GetEnvironmentVariable('USER');
{$ENDIF}

15
components/rx/trunk/rxnew.pas
View File

@ -13,14 +13,13 @@ uses
RegisterRxTools, RxAboutDialog, rxAboutFormUnit, rxappicon, rxapputils,
rxclock, rxconst, rxctrls, rxcustomchartpanel, RxDBColorBox, rxdbcomb,
RxDBCtrls, rxdbgrid, rxdbgrid_columsunit, rxdbgrid_findunit, RxDBSpinEdit,
RxDBTimeEdit, rxdconst, rxdice, rxFileUtils, rxfilterby, rxiconv, rxlogin,
rxlookup, rxmemds, rxpopupunit, rxsortmemds, rxspin, rxswitch,
RxSystemServices, rxtbrsetup, RxTimeEdit, rxtoolbar, RxVersInfo,
RxViewsPanel, rxxpman, seldsfrm, tooledit, vclutils, RxCloseFormValidator,
RxHistoryNavigator, ex_rx_bin_datapacket, ex_rx_datapacket,
ex_rx_xml_datapacket, rxsortby, RxMDI, RxIniPropStorage,
rxDateRangeEditUnit, RxDBGridFooterTools, rxdbgridfootertools_setup,
rxShortCutUnit, LazarusPackageIntf;
RxDBTimeEdit, rxdconst, rxdice, rxfilterby, rxiconv, rxlogin, rxlookup,
rxmemds, rxpopupunit, rxsortmemds, rxspin, rxswitch, RxSystemServices,
rxtbrsetup, RxTimeEdit, rxtoolbar, RxVersInfo, RxViewsPanel, rxxpman,
seldsfrm, tooledit, vclutils, RxCloseFormValidator, RxHistoryNavigator,
ex_rx_bin_datapacket, ex_rx_datapacket, ex_rx_xml_datapacket, rxsortby,
RxMDI, RxIniPropStorage, rxDateRangeEditUnit, RxDBGridFooterTools,
rxdbgridfootertools_setup, rxShortCutUnit, LazarusPackageIntf;
implementation

2
components/rx/trunk/rxtools.pas
View File

@ -8,7 +8,7 @@ unit rxtools;
interface
uses
rxConfigValues, rxstrutils, dateutil, LazarusPackageIntf;
rxConfigValues, rxstrutils, dateutil, rxFileUtils, LazarusPackageIntf;
implementation