Browse Source

Fix for PascalCoinWallet and pascalcoin_daemon Linux compilation and patch for Lazarus 1.8 for UVisualGrid (use TCheckComboItemState instead of PTCheckComboItemState).

maciej-izak 7 years ago
parent
commit
40cc89f939

+ 0 - 3
PascalCoinWallet.lpi

@@ -19,9 +19,6 @@
     <i18n>
       <EnableI18N LFM="False"/>
     </i18n>
-    <VersionInfo>
-      <StringTable ProductVersion=""/>
-    </VersionInfo>
     <BuildModes Count="1">
       <Item1 Name="Default" Default="True"/>
     </BuildModes>

+ 1 - 1
Units/Forms/UFRMMainForm.lfm

@@ -22,7 +22,7 @@ object FRMMainForm: TFRMMainForm
   OnResize = FormResize
   Position = poScreenCenter
   ShowHint = True
-  LCLVersion = '1.6.4.0'
+  LCLVersion = '1.8.0.6'
   object paLogoPanel: TPanel
     Left = 0
     Height = 80

+ 1 - 1
Units/Forms/UFRMMainForm.pas

@@ -17,7 +17,7 @@ interface
 
 uses
   Messages, SysUtils, Classes, Graphics, Controls, Forms,
-  Dialogs, ExtCtrls, ComCtrls, UWallet,
+  Dialogs, ExtCtrls, ComCtrls, LMessages, UWallet,
   ULog,
   UBlockChain, UNode, UGridUtils, UAccounts, Menus,
   UNetProtocol, UCrypto, Buttons, ActnList, UPoolMining,

+ 2 - 2
Units/Forms/UFRMNodes.lfm

@@ -7,8 +7,8 @@ object FRMNodes: TFRMNodes
   ClientHeight = 444
   ClientWidth = 861
   OnCreate = FormCreate
-  Position = poOwnerFormCenter  
-  LCLVersion = '1.6.4.0'
+  Position = poOwnerFormCenter
+  LCLVersion = '1.8.0.6'
   object Label3: TLabel
     Left = 15
     Height = 15

+ 1 - 1
Units/Forms/UFRMNodes.pas

@@ -18,7 +18,7 @@ interface
 uses
   LCLIntf, LCLType,
   Messages, SysUtils, Classes, Graphics, Controls, Forms,
-  Dialogs, ExtCtrls, StdCtrls, UCommonUI,
+  Dialogs, ExtCtrls, StdCtrls, LMessages, UCommonUI,
   ULog,  UBlockChain, UNode, Menus,  UNetProtocol;
 
 Const

+ 1 - 1
Units/Forms/UFRMWalletKeys.lfm

@@ -9,7 +9,7 @@ object FRMWalletKeys: TFRMWalletKeys
   OnCreate = FormCreate
   OnDestroy = FormDestroy
   Position = poOwnerFormCenter
-  LCLVersion = '1.6.4.0'
+  LCLVersion = '1.8.0.6'
   object lbWalletKeys: TListBox
     Left = 24
     Height = 210

+ 1 - 1
Units/Forms/UFRMWalletKeys.pas

@@ -15,7 +15,7 @@ interface
 
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls, Messages,
-  Buttons, Menus, UCommonUI, UWallet;
+  Buttons, Menus, LMessages, UCommonUI, UWallet;
 
 const
   CM_PC_WalletChanged = WM_USER + 1;

+ 1 - 1
Units/Forms/UUserInterface.pas

@@ -16,7 +16,7 @@ interface
 {$I ./../PascalCoin/config.inc}
 
 uses
-  SysUtils, Classes, Forms, Controls, Windows, ExtCtrls, Dialogs,
+  SysUtils, Classes, Forms, Controls, {$IFDEF WINDOWS}Windows,{$ENDIF} ExtCtrls, Dialogs, LCLType,
   UCommonUI, UBlockChain, UAccounts, UNode, UWallet, UConst, UFolderHelper, UGridUtils, URPC, UPoolMining,
   ULog, UThread, UNetProtocol, UCrypto,
   UFRMMainForm, UCTRLSyncronization, UFRMAccountExplorer, UFRMOperationExplorer, UFRMPendingOperations, UFRMOperation,

+ 5 - 5
Units/Utils/UVisualGrid.pas

@@ -1355,7 +1355,7 @@ end;
 
 procedure TCustomVisualGrid.MultiSearchCheckComboBoxChange(Sender: TObject; AIndex: Integer);
 var
-  LState: PTCheckComboItemState;
+  LState: TCheckComboItemState;
   LOldHasEdit, LNewHasEdit: boolean;
 
   function HasOneOrMoreEdit: boolean;
@@ -1370,11 +1370,11 @@ var
 
 begin
   LOldHasEdit := HasOneOrMoreEdit;
-  LState := PTCheckComboItemState(FMultiSearchCheckComboBox.Items.Objects[AIndex]);
-  if Assigned(LState^.Data) then
-    TSearchEdit(LState^.Data).EditVisible:=LState^.State=cbChecked
+  LState := TCheckComboItemState(FMultiSearchCheckComboBox.Items.Objects[AIndex]);
+  if Assigned(LState.Data) then
+    TSearchEdit(LState.Data).EditVisible:=LState.State=cbChecked
   else
-    FSearchEdit.Visible:=LState^.State=cbChecked;
+    FSearchEdit.Visible:=LState.State=cbChecked;
 
   LNewHasEdit := HasOneOrMoreEdit;
   FTopPanelMultiSearch.Visible := LNewHasEdit;

+ 6 - 4
pascalcoin_daemon.lpi

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
-    <Version Value="9"/>
+    <Version Value="10"/>
     <PathDelim Value="\"/>
     <General>
       <Flags>
@@ -17,9 +17,6 @@
     <i18n>
       <EnableI18N LFM="False"/>
     </i18n>
-    <VersionInfo>
-      <StringTable ProductVersion=""/>
-    </VersionInfo>
     <BuildModes Count="1">
       <Item1 Name="Default" Default="True"/>
     </BuildModes>
@@ -33,6 +30,11 @@
         <Display Use="True" Value=""/>
       </local>
     </RunParams>
+    <RequiredPackages Count="1">
+      <Item1>
+        <PackageName Value="LCL"/>
+      </Item1>
+    </RequiredPackages>
     <Units Count="1">
       <Unit0>
         <Filename Value="pascalcoin_daemon.pp"/>

+ 1 - 0
pascalcoin_daemon.pp

@@ -8,6 +8,7 @@ uses
   {$IFDEF UNIX}{$IFDEF UseCThreads}
   cthreads,
   {$ENDIF}{$ENDIF}
+  Interfaces,
   sysutils,
   Classes, daemonapp,
   UCrypto, upcdaemon;