Menu
▾
▴
[Instantobjects-cvscommit] SF.net SVN: instantobjects:[989] trunk/Source
|
From: <car...@us...> - 2018-11-22 14:08:47
|
Revision: 989
http://sourceforge.net/p/instantobjects/code/989
Author: carlobar
Date: 2018-11-22 14:08:44 +0000 (Thu, 22 Nov 2018)
Log Message:
-----------
Modified Paths:
--------------
trunk/Source/Brokers/XML/InstantXML.pas
trunk/Source/Brokers/XML/InstantXMLCatalog.pas
trunk/Source/Core/D10_2/IOCore.dproj
trunk/Source/Core/InstantPersistence.pas
trunk/Source/Core/InstantPresentation.pas
trunk/Source/InstantDefines.inc
Modified: trunk/Source/Brokers/XML/InstantXML.pas
===================================================================
--- trunk/Source/Brokers/XML/InstantXML.pas 2018-11-22 11:17:52 UTC (rev 988)
+++ trunk/Source/Brokers/XML/InstantXML.pas 2018-11-22 14:08:44 UTC (rev 989)
@@ -331,7 +331,7 @@
uses
SysUtils, InstantConsts,
TypInfo, InstantXMLCatalog, InstantUtils,
-{$IFNDEF FMX}
+{$IFNDEF INSTANTOBJECTS_FMX}
InstantXMLConnectionDefEdit, FileCtrl, Controls,
{$ENDIF}
Windows;
@@ -451,7 +451,7 @@
function TInstantXMLConnectionDef.Edit: Boolean;
begin
-{$IFNDEF FMX}
+{$IFNDEF INSTANTOBJECTS_FMX}
with TInstantXMLConnectionDefEditForm.Create(nil) do
try
LoadData(Self);
Modified: trunk/Source/Brokers/XML/InstantXMLCatalog.pas
===================================================================
--- trunk/Source/Brokers/XML/InstantXMLCatalog.pas 2018-11-22 11:17:52 UTC (rev 988)
+++ trunk/Source/Brokers/XML/InstantXMLCatalog.pas 2018-11-22 14:08:44 UTC (rev 989)
@@ -42,7 +42,7 @@
interface
uses
-{$IFNDEF FMX}
+{$IFNDEF INSTANTOBJECTS_FMX}
FileCtrl,
{$ENDIF}
InstantPersistence, InstantBrokers, InstantMetadata, InstantTypes;
Modified: trunk/Source/Core/D10_2/IOCore.dproj
===================================================================
--- trunk/Source/Core/D10_2/IOCore.dproj 2018-11-22 11:17:52 UTC (rev 988)
+++ trunk/Source/Core/D10_2/IOCore.dproj 2018-11-22 14:08:44 UTC (rev 989)
@@ -1,4 +1,4 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectGuid>{E05C5686-CAF4-44C4-81A4-CEC21E8392DD}</ProjectGuid>
<MainSource>IOCore.dpk</MainSource>
@@ -7,7 +7,7 @@
<TargetedPlatforms>1</TargetedPlatforms>
<AppType>Package</AppType>
<FrameworkType>VCL</FrameworkType>
- <ProjectVersion>18.2</ProjectVersion>
+ <ProjectVersion>18.4</ProjectVersion>
<Platform Condition="'$(Platform)'==''">Win32</Platform>
</PropertyGroup>
<PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
@@ -18,16 +18,6 @@
<CfgParent>Base</CfgParent>
<Base>true</Base>
</PropertyGroup>
- <PropertyGroup Condition="('$(Platform)'=='iOSDevice32' and '$(Base)'=='true') or '$(Base_iOSDevice32)'!=''">
- <Base_iOSDevice32>true</Base_iOSDevice32>
- <CfgParent>Base</CfgParent>
- <Base>true</Base>
- </PropertyGroup>
- <PropertyGroup Condition="('$(Platform)'=='iOSDevice64' and '$(Base)'=='true') or '$(Base_iOSDevice64)'!=''">
- <Base_iOSDevice64>true</Base_iOSDevice64>
- <CfgParent>Base</CfgParent>
- <Base>true</Base>
- </PropertyGroup>
<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Base)'=='true') or '$(Base_Win32)'!=''">
<Base_Win32>true</Base_Win32>
<CfgParent>Base</CfgParent>
@@ -49,18 +39,6 @@
<CfgParent>Base</CfgParent>
<Base>true</Base>
</PropertyGroup>
- <PropertyGroup Condition="('$(Platform)'=='iOSDevice32' and '$(Cfg_2)'=='true') or '$(Cfg_2_iOSDevice32)'!=''">
- <Cfg_2_iOSDevice32>true</Cfg_2_iOSDevice32>
- <CfgParent>Cfg_2</CfgParent>
- <Cfg_2>true</Cfg_2>
- <Base>true</Base>
- </PropertyGroup>
- <PropertyGroup Condition="('$(Platform)'=='iOSDevice64' and '$(Cfg_2)'=='true') or '$(Cfg_2_iOSDevice64)'!=''">
- <Cfg_2_iOSDevice64>true</Cfg_2_iOSDevice64>
- <CfgParent>Cfg_2</CfgParent>
- <Cfg_2>true</Cfg_2>
- <Base>true</Base>
- </PropertyGroup>
<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win32)'!=''">
<Cfg_2_Win32>true</Cfg_2_Win32>
<CfgParent>Cfg_2</CfgParent>
@@ -91,20 +69,6 @@
<BT_BuildType>Debug</BT_BuildType>
<VerInfo_Keys>package=com.embarcadero.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=1;versionName=1.0.0;persistent=False;restoreAnyVersion=False;installLocation=preferExternal;largeHeap=False;theme=TitleBar</VerInfo_Keys>
</PropertyGroup>
- <PropertyGroup Condition="'$(Base_iOSDevice32)'!=''">
- <VerInfo_UIDeviceFamily>iPhoneAndiPad</VerInfo_UIDeviceFamily>
- <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
- <BT_BuildType>Debug</BT_BuildType>
- <VerInfo_BundleId>$(MSBuildProjectName)</VerInfo_BundleId>
- <VerInfo_Keys>CFBundleName=$(MSBuildProjectName);CFBundleDevelopmentRegion=en;CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleInfoDictionaryVersion=7.1;CFBundleVersion=1.0.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;LSRequiresIPhoneOS=true;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);UIDeviceFamily=iPhone & iPad;CFBundleResourceSpecification=ResourceRules.plist;NSLocationAlwaysUsageDescription=The reason for accessing the location information of the user;NSLocationWhenInUseUsageDescription=The reason for accessing the location information of the user;FMLocalNotificationPermission=false</VerInfo_Keys>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Base_iOSDevice64)'!=''">
- <VerInfo_UIDeviceFamily>iPhoneAndiPad</VerInfo_UIDeviceFamily>
- <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
- <BT_BuildType>Debug</BT_BuildType>
- <VerInfo_BundleId>$(MSBuildProjectName)</VerInfo_BundleId>
- <VerInfo_Keys>CFBundleName=$(MSBuildProjectName);CFBundleDevelopmentRegion=en;CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleInfoDictionaryVersion=7.1;CFBundleVersion=1.0.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;LSRequiresIPhoneOS=true;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);UIDeviceFamily=iPhone & iPad;CFBundleResourceSpecification=ResourceRules.plist;NSLocationAlwaysUsageDescription=The reason for accessing the location information of the user;NSLocationWhenInUseUsageDescription=The reason for accessing the location information of the user;FMLocalNotificationPermission=false</VerInfo_Keys>
- </PropertyGroup>
<PropertyGroup Condition="'$(Base_Win32)'!=''">
<DCC_Namespace>Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
@@ -123,12 +87,6 @@
<DCC_Optimize>false</DCC_Optimize>
<DCC_GenerateStackFrames>true</DCC_GenerateStackFrames>
</PropertyGroup>
- <PropertyGroup Condition="'$(Cfg_2_iOSDevice32)'!=''">
- <DCC_RemoteDebug>true</DCC_RemoteDebug>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Cfg_2_iOSDevice64)'!=''">
- <DCC_RemoteDebug>true</DCC_RemoteDebug>
- </PropertyGroup>
<PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
</PropertyGroup>
@@ -229,11 +187,7 @@
</Delphi.Personality>
<Platforms>
<Platform value="Android">False</Platform>
- <Platform value="iOSDevice32">False</Platform>
- <Platform value="iOSDevice64">False</Platform>
- <Platform value="iOSSimulator">False</Platform>
<Platform value="Win32">True</Platform>
- <Platform value="Win64">False</Platform>
</Platforms>
</BorlandProject>
<ProjectFileVersion>12</ProjectFileVersion>
Modified: trunk/Source/Core/InstantPersistence.pas
===================================================================
--- trunk/Source/Core/InstantPersistence.pas 2018-11-22 11:17:52 UTC (rev 988)
+++ trunk/Source/Core/InstantPersistence.pas 2018-11-22 14:08:44 UTC (rev 989)
@@ -41,7 +41,7 @@
interface
uses
- {$IFDEF FMX}FMX.Objects,{$ELSE}Graphics,{$ENDIF}
+ {$IFDEF INSTANTOBJECTS_FMX}FMX.Objects,{$ELSE}Graphics,{$ENDIF}
Classes, {$IFNDEF NEXTGEN}Contnrs,{$ENDIF} SysUtils, DB, InstantClasses, InstantCommand, InstantConsts,
InstantMetadata, InstantTypes;
@@ -463,7 +463,7 @@
public
destructor Destroy; override;
procedure Assign(Source: TPersistent); override;
-{$IFDEF FMX}
+{$IFDEF INSTANTOBJECTS_FMX}
procedure AssignPicture(Source: TImage);
procedure AssignToPicture(Dest: TImage);
{$ELSE}
@@ -1600,7 +1600,7 @@
procedure InstantUnregisterClasses(AClasses: array of TInstantObjectClass);
function InstantResolveGraphicFileType(AStream: TStream ): TInstantGraphicFileFormat;
-{$IFNDEF FMX}
+{$IFNDEF INSTANTOBJECTS_FMX}
procedure InstantRegisterGraphicClass(InstantGraphicFileFormat : TInstantGraphicFileFormat;
AGraphicClass: TGraphicClass);
function InstantGraphicFileFormatToGraphicClass(InstantGraphicFileFormat : TInstantGraphicFileFormat) : TGraphicClass;
@@ -1651,7 +1651,7 @@
var
ConnectorClasses: TList;
ClassList: TList;
-{$IFNDEF FMX}
+{$IFNDEF INSTANTOBJECTS_FMX}
GraphicClassList: array[TInstantGraphicFileFormat] OF TGraphicClass;
{$ENDIF}
RuntimeModel: TInstantModel;
@@ -2052,7 +2052,7 @@
end;
end;
-{$IFNDEF FMX}
+{$IFNDEF INSTANTOBJECTS_FMX}
procedure InstantRegisterGraphicClass(InstantGraphicFileFormat : TInstantGraphicFileFormat;
AGraphicClass: TGraphicClass);
begin
@@ -3793,7 +3793,7 @@
Writer.WriteBinary(SaveDataToStream);
end;
-{$IFDEF FMX}
+{$IFDEF INSTANTOBJECTS_FMX}
procedure TInstantBlob.AssignPicture(Source: TImage);
begin
if Assigned(Source.Bitmap) then
@@ -3871,7 +3871,7 @@
procedure TInstantBlob.AssignTo(Dest: TPersistent);
begin
-{$IFDEF FMX}
+{$IFDEF INSTANTOBJECTS_FMX}
if Dest is TImage then
AssignToPicture(TImage(Dest))
else
@@ -9323,7 +9323,7 @@
TInstantObjectReference, TInstantConnectionDefs, TInstantConnectionDef]);
ClassList := TList.Create;
{$IFDEF MSWINDOWS}
-{$IFNDEF FMX}
+{$IFNDEF INSTANTOBJECTS_FMX}
GraphicClassList[gffIco] := Graphics.TIcon;
GraphicClassList[gffBmp] := Graphics.TBitmap;
{$IFNDEF FPC}
Modified: trunk/Source/Core/InstantPresentation.pas
===================================================================
--- trunk/Source/Core/InstantPresentation.pas 2018-11-22 11:17:52 UTC (rev 988)
+++ trunk/Source/Core/InstantPresentation.pas 2018-11-22 14:08:44 UTC (rev 989)
@@ -3894,6 +3894,8 @@
ClearRecord(Buffer)
else begin
Obj := Objects[Pred(RecNo)];
+ if not Assigned(Obj) then
+ raise Exception.Create('Critical error: object not found!');
CopyObjectToBuffer(Obj, Buffer);
with GetRecInfo(Buffer)^ do
begin
Modified: trunk/Source/InstantDefines.inc
===================================================================
--- trunk/Source/InstantDefines.inc 2018-11-22 11:17:52 UTC (rev 988)
+++ trunk/Source/InstantDefines.inc 2018-11-22 14:08:44 UTC (rev 989)
@@ -57,6 +57,7 @@
{$DEFINE D12+}
{$ENDIF}
+// Delphi 2010
{$IFDEF VER210}
{$DEFINE D5+}
{$DEFINE D6+}
@@ -69,6 +70,7 @@
{$DEFINE D14+}
{$ENDIF}
+// Delphi XE
{$IFDEF VER220}
{$DEFINE D5+}
{$DEFINE D6+}
@@ -82,6 +84,7 @@
{$DEFINE D15+}
{$ENDIF}
+// Delphi XE2
{$IFDEF VER230}
{$DEFINE D5+}
{$DEFINE D6+}
@@ -276,6 +279,31 @@
{$DEFINE D25+}
{$ENDIF}
+// Delphi 10.3 Rio
+{$IFDEF VER330}
+ {$DEFINE D5+}
+ {$DEFINE D6+}
+ {$DEFINE D7+}
+ {$DEFINE D9+}
+ {$DEFINE D10+}
+ {$DEFINE D11+}
+ {$DEFINE D12+}
+ {$DEFINE D14+}
+ {$DEFINE D15+}
+ {$DEFINE D16+}
+ {$DEFINE D17+}
+ {$DEFINE D18+}
+ {$DEFINE D19+}
+ {$DEFINE D20+}
+ {$DEFINE D21+}
+ {$DEFINE D22+}
+ {$DEFINE D23+}
+ {$DEFINE D24+}
+ {$DEFINE D25+}
+ {$DEFINE D26}
+ {$DEFINE D26+}
+{$ENDIF}
+
{$IFDEF FPC}
{$DEFINE D5+}
{$DEFINE D6+}
|
