paweld/lazarus-ccr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

RxFPC: fix compile after last commit

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@5451 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
alexs75 2016-12-08 13:54:00 +00:00
parent 078466b678
commit 17b82f66f4
12 changed files with 192 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/rx/trunk/languages/rxconst.es.po
View File

@ -245,6 +245,10 @@ msgstr "Menu panel herramienta"
msgid "Transparent" msgid "Transparent"
msgstr "Transparente" msgstr "Transparente"
#: rxconst.svariableisnotstring
msgid "Variable %s is not string"
msgstr ""
#: rxconst.svisiblebuttons #: rxconst.svisiblebuttons
msgid "Visible buttons" msgid "Visible buttons"
msgstr "Botones visibles" msgstr "Botones visibles"

4
components/rx/trunk/languages/rxconst.po
View File

@ -241,6 +241,10 @@ msgstr ""
msgid "Transparent" msgid "Transparent"
msgstr "" msgstr ""
#: rxconst.svariableisnotstring
msgid "Variable %s is not string"
msgstr ""
#: rxconst.svisiblebuttons #: rxconst.svisiblebuttons
msgid "Visible buttons" msgid "Visible buttons"
msgstr "" msgstr ""

4
components/rx/trunk/languages/rxconst.ru.po
View File

@ -241,6 +241,10 @@ msgstr "Настройка панели инструментов"
msgid "Transparent" msgid "Transparent"
msgstr "Прозрачно" msgstr "Прозрачно"
#: rxconst.svariableisnotstring
msgid "Variable %s is not string"
msgstr ""
#: rxconst.svisiblebuttons #: rxconst.svisiblebuttons
msgid "Visible buttons" msgid "Visible buttons"
msgstr "Отображаемые кнопки" msgstr "Отображаемые кнопки"

4
components/rx/trunk/languages/rxconst.uk.po
View File

@ -258,6 +258,10 @@ msgstr "Налаштування панелі інструментів"
msgid "Transparent" msgid "Transparent"
msgstr "Прозоро" msgstr "Прозоро"
#: rxconst.svariableisnotstring
msgid "Variable %s is not string"
msgstr ""
#: rxconst.svisiblebuttons #: rxconst.svisiblebuttons
msgid "Visible buttons" msgid "Visible buttons"
msgstr "Видимі кнопки" msgstr "Видимі кнопки"

5
components/rx/trunk/rxconfigvalues.pas
View File

@ -126,6 +126,7 @@ type
end; end;
implementation implementation
uses rxconst;
{ TConfigValuesEnumerator } { TConfigValuesEnumerator }
@ -370,7 +371,7 @@ begin
if FDataType = cvtString then if FDataType = cvtString then
Result:=FValue Result:=FValue
else else
raise Exception.CreateFmt('Variable %s is not string', [FName]); raise Exception.CreateFmt(sVariableIsNotString, [FName]);
end; end;
procedure TConfigValue.SetAsBoolean(const AValue: boolean); procedure TConfigValue.SetAsBoolean(const AValue: boolean);
@ -440,7 +441,7 @@ begin
end end
end end
else else
raise Exception.CreateFmt('Variable %s is not string', [FName]); raise Exception.CreateFmt(sVariableIsNotString, [FName]);
end; end;
constructor TConfigValue.Create; constructor TConfigValue.Create;

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

@ -35,29 +35,10 @@ interface
{$I RX.INC} {$I RX.INC}
uses LMessages, Controls;
const const
RX_VERSION = $0002004B; { 2.75 } RX_VERSION = $0002004B; { 2.75 }
const
{ Command message for Speedbar editor }
CM_SPEEDBARCHANGED = CM_BASE + 80;
{ Command message for TRxSpeedButton }
CM_RXBUTTONPRESSED = CM_BASE + 81;
{ Command messages for TRxWindowHook }
CM_RECREATEWINDOW = CM_BASE + 82;
CM_DESTROYHOOK = CM_BASE + 83;
{ Notify message for TRxTrayIcon }
CM_TRAYICON = CM_BASE + 84;
const
crHand = TCursor(14000);
crDragHand = TCursor(14001);
//const
//{ TBitmap.GetTransparentColor from GRAPHICS.PAS uses this value }
// PaletteMask = $02000000;
resourcestring resourcestring
sBrowse = 'Browse'; sBrowse = 'Browse';
@ -139,6 +120,9 @@ resourcestring
{ TFolderLister } { TFolderLister }
sFolderListerErr = '%s. Not assigned property MenuItem'; sFolderListerErr = '%s. Not assigned property MenuItem';
{ TConfigValues }
sVariableIsNotString = 'Variable %s is not string';
implementation implementation
end. end.

61
components/rx/trunk/rxlclconst.pas Normal file
View File

@ -0,0 +1,61 @@
{ rxlclconst unit
Copyright (C) 2005-2016 Lagunov Aleksey alexs75@yandex.ru and Lazarus team
original conception from rx library for Delphi (c)
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Library General Public License as published by
the Free Software Foundation; either version 2 of the License, or (at your
option) any later version with the following modification:
As a special exception, the copyright holders of this library give you
permission to link this library with independent modules to produce an
executable, regardless of the license terms of these independent modules,and
to copy and distribute the resulting executable under terms of your choice,
provided that you also meet, for each linked independent module, the terms
and conditions of the license of that module. An independent module is a
module which is not derived from or based on this library. If you modify
this library, you may extend this exception to your version of the library,
but you are not obligated to do so. If you do not wish to do so, delete this
exception statement from your version.
This program is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License
for more details.
You should have received a copy of the GNU Library General Public License
along with this library; if not, write to the Free Software Foundation,
Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
}
unit rxlclconst;
interface
{$I RX.INC}
uses LMessages, Controls;
const
{ Command message for Speedbar editor }
CM_SPEEDBARCHANGED = CM_BASE + 80;
{ Command message for TRxSpeedButton }
CM_RXBUTTONPRESSED = CM_BASE + 81;
{ Command messages for TRxWindowHook }
CM_RECREATEWINDOW = CM_BASE + 82;
CM_DESTROYHOOK = CM_BASE + 83;
{ Notify message for TRxTrayIcon }
CM_TRAYICON = CM_BASE + 84;
{
const
crHand = TCursor(14000);
crDragHand = TCursor(14001);
}
//const
//{ TBitmap.GetTransparentColor from GRAPHICS.PAS uses this value }
// PaletteMask = $02000000;
implementation
end.

4
components/rx/trunk/rxlogin.pas
View File

@ -411,12 +411,12 @@ begin
with AppIcon do with AppIcon do
begin begin
OnDblClick := @DoIconDblClick; OnDblClick := @DoIconDblClick;
Cursor := crHand; Cursor := crHandPoint;
end; end;
with KeyImage do with KeyImage do
begin begin
OnDblClick := @DoIconDblClick; OnDblClick := @DoIconDblClick;
Cursor := crHand; Cursor := crHandPoint;
end; end;
end; end;
PasswordEdit.MaxLength := FMaxPasswordLen; PasswordEdit.MaxLength := FMaxPasswordLen;

196
components/rx/trunk/rxnew.lpk
View File

@ -107,200 +107,200 @@ translate to Lazarus by alexs in 2005 - 2016
<UnitName Value="rxclock"/> <UnitName Value="rxclock"/>
</Item19> </Item19>
<Item20> <Item20>
<Filename Value="rxconst.pas"/>
<UnitName Value="rxconst"/>
</Item20>
<Item21>
<Filename Value="rxctrls.pas"/> <Filename Value="rxctrls.pas"/>
<UnitName Value="rxctrls"/> <UnitName Value="rxctrls"/>
</Item21> </Item20>
<Item22> <Item21>
<Filename Value="rxdbcolorbox.pas"/> <Filename Value="rxdbcolorbox.pas"/>
<UnitName Value="RxDBColorBox"/> <UnitName Value="RxDBColorBox"/>
</Item22> </Item21>
<Item23> <Item22>
<Filename Value="rxdbcomb.pas"/> <Filename Value="rxdbcomb.pas"/>
<UnitName Value="rxdbcomb"/> <UnitName Value="rxdbcomb"/>
</Item23> </Item22>
<Item24> <Item23>
<Filename Value="rxdbctrls.pas"/> <Filename Value="rxdbctrls.pas"/>
<UnitName Value="RxDBCtrls"/> <UnitName Value="RxDBCtrls"/>
</Item24> </Item23>
<Item25> <Item24>
<Filename Value="rxdbgrid.pas"/> <Filename Value="rxdbgrid.pas"/>
<UnitName Value="rxdbgrid"/> <UnitName Value="rxdbgrid"/>
</Item25> </Item24>
<Item26> <Item25>
<Filename Value="rxdbgrid_columsunit.pas"/> <Filename Value="rxdbgrid_columsunit.pas"/>
<UnitName Value="rxdbgrid_columsunit"/> <UnitName Value="rxdbgrid_columsunit"/>
</Item26> </Item25>
<Item27> <Item26>
<Filename Value="rxdbgrid_findunit.pas"/> <Filename Value="rxdbgrid_findunit.pas"/>
<UnitName Value="rxdbgrid_findunit"/> <UnitName Value="rxdbgrid_findunit"/>
</Item27> </Item26>
<Item28> <Item27>
<Filename Value="rxdbspinedit.pas"/> <Filename Value="rxdbspinedit.pas"/>
<UnitName Value="RxDBSpinEdit"/> <UnitName Value="RxDBSpinEdit"/>
</Item28> </Item27>
<Item29> <Item28>
<Filename Value="rxdbtimeedit.pas"/> <Filename Value="rxdbtimeedit.pas"/>
<UnitName Value="RxDBTimeEdit"/> <UnitName Value="RxDBTimeEdit"/>
</Item29> </Item28>
<Item30> <Item29>
<Filename Value="rxdconst.pas"/> <Filename Value="rxdconst.pas"/>
<UnitName Value="rxdconst"/> <UnitName Value="rxdconst"/>
</Item30> </Item29>
<Item31> <Item30>
<Filename Value="rxdice.pas"/> <Filename Value="rxdice.pas"/>
<UnitName Value="rxdice"/> <UnitName Value="rxdice"/>
</Item31> </Item30>
<Item32> <Item31>
<Filename Value="rxfilterby.pas"/> <Filename Value="rxfilterby.pas"/>
<UnitName Value="rxfilterby"/> <UnitName Value="rxfilterby"/>
</Item32> </Item31>
<Item33> <Item32>
<Filename Value="rxiconv.pas"/> <Filename Value="rxiconv.pas"/>
<UnitName Value="rxiconv"/> <UnitName Value="rxiconv"/>
</Item33> </Item32>
<Item34> <Item33>
<Filename Value="rxlogin.pas"/> <Filename Value="rxlogin.pas"/>
<UnitName Value="rxlogin"/> <UnitName Value="rxlogin"/>
</Item34> </Item33>
<Item35> <Item34>
<Filename Value="rxlookup.pas"/> <Filename Value="rxlookup.pas"/>
<UnitName Value="rxlookup"/> <UnitName Value="rxlookup"/>
</Item35> </Item34>
<Item36> <Item35>
<Filename Value="rxmemds.pas"/> <Filename Value="rxmemds.pas"/>
<UnitName Value="rxmemds"/> <UnitName Value="rxmemds"/>
</Item36> </Item35>
<Item37> <Item36>
<Filename Value="rxpopupunit.pas"/> <Filename Value="rxpopupunit.pas"/>
<UnitName Value="rxpopupunit"/> <UnitName Value="rxpopupunit"/>
</Item37> </Item36>
<Item38> <Item37>
<Filename Value="rxsortmemds.pas"/> <Filename Value="rxsortmemds.pas"/>
<UnitName Value="rxsortmemds"/> <UnitName Value="rxsortmemds"/>
</Item38> </Item37>
<Item39> <Item38>
<Filename Value="rxspin.pas"/> <Filename Value="rxspin.pas"/>
<UnitName Value="rxspin"/> <UnitName Value="rxspin"/>
</Item39> </Item38>
<Item40> <Item39>
<Filename Value="rxswitch.pas"/> <Filename Value="rxswitch.pas"/>
<UnitName Value="rxswitch"/> <UnitName Value="rxswitch"/>
</Item40> </Item39>
<Item41> <Item40>
<Filename Value="rxsystemservices.pas"/> <Filename Value="rxsystemservices.pas"/>
<UnitName Value="RxSystemServices"/> <UnitName Value="RxSystemServices"/>
</Item41> </Item40>
<Item42> <Item41>
<Filename Value="rxtbrsetup.pas"/> <Filename Value="rxtbrsetup.pas"/>
<UnitName Value="rxtbrsetup"/> <UnitName Value="rxtbrsetup"/>
</Item42> </Item41>
<Item43> <Item42>
<Filename Value="rxtimeedit.pas"/> <Filename Value="rxtimeedit.pas"/>
<UnitName Value="RxTimeEdit"/> <UnitName Value="RxTimeEdit"/>
</Item43> </Item42>
<Item44> <Item43>
<Filename Value="rxtoolbar.pas"/> <Filename Value="rxtoolbar.pas"/>
<UnitName Value="rxtoolbar"/> <UnitName Value="rxtoolbar"/>
</Item44> </Item43>
<Item45> <Item44>
<Filename Value="rxversinfo.pas"/> <Filename Value="rxversinfo.pas"/>
<UnitName Value="RxVersInfo"/> <UnitName Value="RxVersInfo"/>
</Item45> </Item44>
<Item46> <Item45>
<Filename Value="rxviewspanel.pas"/> <Filename Value="rxviewspanel.pas"/>
<UnitName Value="RxViewsPanel"/> <UnitName Value="RxViewsPanel"/>
</Item46> </Item45>
<Item47> <Item46>
<Filename Value="rxseldsfrm.pas"/> <Filename Value="rxseldsfrm.pas"/>
<UnitName Value="rxseldsfrm"/> <UnitName Value="rxseldsfrm"/>
</Item47> </Item46>
<Item48> <Item47>
<Filename Value="rxtooledit.pas"/> <Filename Value="rxtooledit.pas"/>
<UnitName Value="rxtooledit"/> <UnitName Value="rxtooledit"/>
</Item48> </Item47>
<Item49> <Item48>
<Filename Value="rxvclutils.pas"/> <Filename Value="rxvclutils.pas"/>
<UnitName Value="rxvclutils"/> <UnitName Value="rxvclutils"/>
</Item49> </Item48>
<Item50> <Item49>
<Filename Value="rxcloseformvalidator.pas"/> <Filename Value="rxcloseformvalidator.pas"/>
<UnitName Value="RxCloseFormValidator"/> <UnitName Value="RxCloseFormValidator"/>
</Item50> </Item49>
<Item51> <Item50>
<Filename Value="rxhistorynavigator.pas"/> <Filename Value="rxhistorynavigator.pas"/>
<UnitName Value="RxHistoryNavigator"/> <UnitName Value="RxHistoryNavigator"/>
</Item51> </Item50>
<Item52> <Item51>
<Filename Value="ex_rx_bin_datapacket.pas"/> <Filename Value="ex_rx_bin_datapacket.pas"/>
<UnitName Value="ex_rx_bin_datapacket"/> <UnitName Value="ex_rx_bin_datapacket"/>
</Item52> </Item51>
<Item53> <Item52>
<Filename Value="ex_rx_datapacket.pas"/> <Filename Value="ex_rx_datapacket.pas"/>
<UnitName Value="ex_rx_datapacket"/> <UnitName Value="ex_rx_datapacket"/>
</Item53> </Item52>
<Item54> <Item53>
<Filename Value="ex_rx_xml_datapacket.pas"/> <Filename Value="ex_rx_xml_datapacket.pas"/>
<UnitName Value="ex_rx_xml_datapacket"/> <UnitName Value="ex_rx_xml_datapacket"/>
</Item54> </Item53>
<Item55> <Item54>
<Filename Value="rxsortby.lfm"/> <Filename Value="rxsortby.lfm"/>
<Type Value="LFM"/> <Type Value="LFM"/>
</Item55> </Item54>
<Item56> <Item55>
<Filename Value="rxsortby.pas"/> <Filename Value="rxsortby.pas"/>
<UnitName Value="rxsortby"/> <UnitName Value="rxsortby"/>
</Item56> </Item55>
<Item57> <Item56>
<Filename Value="rxmdi.pas"/> <Filename Value="rxmdi.pas"/>
<UnitName Value="RxMDI"/> <UnitName Value="RxMDI"/>
</Item57> </Item56>
<Item58> <Item57>
<Filename Value="rxinipropstorage.pas"/> <Filename Value="rxinipropstorage.pas"/>
<UnitName Value="RxIniPropStorage"/> <UnitName Value="RxIniPropStorage"/>
</Item58> </Item57>
<Item59> <Item58>
<Filename Value="rx_lcl.res"/> <Filename Value="rx_lcl.res"/>
<Type Value="Binary"/> <Type Value="Binary"/>
</Item59> </Item58>
<Item60> <Item59>
<Filename Value="rxdaterangeeditunit.pas"/> <Filename Value="rxdaterangeeditunit.pas"/>
<UnitName Value="rxDateRangeEditUnit"/> <UnitName Value="rxDateRangeEditUnit"/>
</Item60> </Item59>
<Item61> <Item60>
<Filename Value="rxdbgridfootertools.pas"/> <Filename Value="rxdbgridfootertools.pas"/>
<UnitName Value="RxDBGridFooterTools"/> <UnitName Value="RxDBGridFooterTools"/>
</Item61> </Item60>
<Item62> <Item61>
<Filename Value="rxdbgridfootertools_setup.lfm"/> <Filename Value="rxdbgridfootertools_setup.lfm"/>
<Type Value="LFM"/> <Type Value="LFM"/>
</Item62> </Item61>
<Item63> <Item62>
<Filename Value="rxdbgridfootertools_setup.pas"/> <Filename Value="rxdbgridfootertools_setup.pas"/>
<UnitName Value="rxdbgridfootertools_setup"/> <UnitName Value="rxdbgridfootertools_setup"/>
</Item63> </Item62>
<Item64> <Item63>
<Filename Value="rxshortcutunit.lfm"/> <Filename Value="rxshortcutunit.lfm"/>
<Type Value="LFM"/> <Type Value="LFM"/>
</Item64> </Item63>
<Item65> <Item64>
<Filename Value="rxshortcutunit.pas"/> <Filename Value="rxshortcutunit.pas"/>
<UnitName Value="rxShortCutUnit"/> <UnitName Value="rxShortCutUnit"/>
</Item65> </Item64>
<Item66> <Item65>
<Filename Value="rxdbgridexportpdf.pas"/> <Filename Value="rxdbgridexportpdf.pas"/>
<UnitName Value="RxDBGridExportPdf"/> <UnitName Value="RxDBGridExportPdf"/>
</Item66> </Item65>
<Item67> <Item66>
<Filename Value="rxdbgridexportpdfsetupunit.lfm"/> <Filename Value="rxdbgridexportpdfsetupunit.lfm"/>
<Type Value="LFM"/> <Type Value="LFM"/>
</Item67> </Item66>
<Item68> <Item67>
<Filename Value="rxdbgridexportpdfsetupunit.pas"/> <Filename Value="rxdbgridexportpdfsetupunit.pas"/>
<UnitName Value="RxDBGridExportPdfSetupUnit"/> <UnitName Value="RxDBGridExportPdfSetupUnit"/>
</Item67>
<Item68>
<Filename Value="rxlclconst.pas"/>
<UnitName Value="rxlclconst"/>
</Item68> </Item68>
</Files> </Files>
<LazDoc Paths="docs;\usr\local\share\lazarus\components\rxnew\docs"/> <LazDoc Paths="docs;\usr\local\share\lazarus\components\rxnew\docs"/>

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

@ -11,7 +11,7 @@ uses
RxAutoPanel, rxboxprocs, rxcurredit, rxdbcurredit, rxdbdateedit, rxdbutils, RxAutoPanel, rxboxprocs, rxcurredit, rxdbcurredit, rxdbdateedit, rxdbutils,
rxduallist, rxfduallst, rxfolderlister, rxpagemngr, rxpickdate, registerrx, rxduallist, rxfduallst, rxfolderlister, rxpagemngr, rxpickdate, registerrx,
RegisterRxDB, RegisterRxTools, RxAboutDialog, rxAboutFormUnit, rxapputils, RegisterRxDB, RegisterRxTools, RxAboutDialog, rxAboutFormUnit, rxapputils,
rxclock, rxconst, rxctrls, RxDBColorBox, rxdbcomb, RxDBCtrls, rxdbgrid, rxclock, rxctrls, RxDBColorBox, rxdbcomb, RxDBCtrls, rxdbgrid,
rxdbgrid_columsunit, rxdbgrid_findunit, RxDBSpinEdit, RxDBTimeEdit, rxdbgrid_columsunit, rxdbgrid_findunit, RxDBSpinEdit, RxDBTimeEdit,
rxdconst, rxdice, rxfilterby, rxiconv, rxlogin, rxlookup, rxmemds, rxdconst, rxdice, rxfilterby, rxiconv, rxlogin, rxlookup, rxmemds,
rxpopupunit, rxsortmemds, rxspin, rxswitch, RxSystemServices, rxtbrsetup, rxpopupunit, rxsortmemds, rxspin, rxswitch, RxSystemServices, rxtbrsetup,
@ -19,7 +19,7 @@ uses
rxvclutils, RxCloseFormValidator, RxHistoryNavigator, ex_rx_bin_datapacket, rxvclutils, RxCloseFormValidator, RxHistoryNavigator, ex_rx_bin_datapacket,
ex_rx_datapacket, ex_rx_xml_datapacket, rxsortby, RxMDI, RxIniPropStorage, ex_rx_datapacket, ex_rx_xml_datapacket, rxsortby, RxMDI, RxIniPropStorage,
rxDateRangeEditUnit, RxDBGridFooterTools, rxdbgridfootertools_setup, rxDateRangeEditUnit, RxDBGridFooterTools, rxdbgridfootertools_setup,
rxShortCutUnit, RxDBGridExportPdf, RxDBGridExportPdfSetupUnit, rxShortCutUnit, RxDBGridExportPdf, RxDBGridExportPdfSetupUnit, rxlclconst,
LazarusPackageIntf; LazarusPackageIntf;
implementation implementation

6
components/rx/trunk/rxtools.lpk
View File

@ -15,7 +15,7 @@
"/> "/>
<License Value="LGPL"/> <License Value="LGPL"/>
<Version Minor="1" Build="2"/> <Version Minor="1" Build="2"/>
<Files Count="4"> <Files Count="5">
<Item1> <Item1>
<Filename Value="rxconfigvalues.pas"/> <Filename Value="rxconfigvalues.pas"/>
<UnitName Value="rxConfigValues"/> <UnitName Value="rxConfigValues"/>
@ -32,6 +32,10 @@
<Filename Value="rxfileutils.pas"/> <Filename Value="rxfileutils.pas"/>
<UnitName Value="rxFileUtils"/> <UnitName Value="rxFileUtils"/>
</Item4> </Item4>
<Item5>
<Filename Value="rxconst.pas"/>
<UnitName Value="rxconst"/>
</Item5>
</Files> </Files>
<LazDoc Paths="docs;/usr/local/share/lazarus/components/rxnew/docs"/> <LazDoc Paths="docs;/usr/local/share/lazarus/components/rxnew/docs"/>
<RequiredPkgs Count="1"> <RequiredPkgs Count="1">

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

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