[Instantobjects-cvscommit] SF.net SVN: instantobjects: [644] trunk/Source/Core

[<sr...@us...>]

Revision: 644
Author:   srmitch
Date:     2006-03-11 01:13:45 -0800 (Sat, 11 Mar 2006)
ViewCVS:  http://svn.sourceforge.net/instantobjects?rev=644&view=rev

Log Message:
-----------
Changes related to D5 bugs and compatibility:
1. Fixed bugs [SF #1447789] in InstantRtti.pas related to compilation and handling of Boolean type in private unit function AccessProperty;

2. Bug fix [SF #1447794] for ObjectFoundry - Added Windows unit to Interface uses clause in OPFExpert.pas so that ObjectFoundry can be built in D5. Also removed Windows unit from Implementation uses clause as it's not needed.

Modified Paths:
--------------
    trunk/Source/Brokers/NexusDb/InstantNexusDBConnectionDefEdit.dfm
    trunk/Source/Core/InstantRtti.pas
    trunk/Source/ObjectFoundry/OFExpert.pas
Modified: trunk/Source/Brokers/NexusDb/InstantNexusDBConnectionDefEdit.dfm
===================================================================
--- trunk/Source/Brokers/NexusDb/InstantNexusDBConnectionDefEdit.dfm	2006-03-10 10:56:53 UTC (rev 643)
+++ trunk/Source/Brokers/NexusDb/InstantNexusDBConnectionDefEdit.dfm	2006-03-11 09:13:45 UTC (rev 644)
@@ -1,6 +1,6 @@
 object InstantNexusDBConnectionDefEditForm: TInstantNexusDBConnectionDefEditForm
-  Left = 1622
-  Top = 49
+  Left = 360
+  Top = 384
   BorderStyle = bsDialog
   Caption = 'NexusDB Connection'
   ClientHeight = 340

Modified: trunk/Source/Core/InstantRtti.pas
===================================================================
--- trunk/Source/Core/InstantRtti.pas	2006-03-10 10:56:53 UTC (rev 643)
+++ trunk/Source/Core/InstantRtti.pas	2006-03-11 09:13:45 UTC (rev 644)
@@ -125,10 +125,15 @@
             begin
               {$IFDEF D6+}
               if VarIsStr(Value) and (VarToStr(Value) = '') then
+                Value := 0;
               {$ELSE}
-              if Value = '' then
+              case VarType(Value) of
+                varString :   if VarToStr(Value) = '' then
+                                Value := 0;
+                varBoolean:   if (VarToStr(Value) <> '0') then
+                                Value := 1;
+              end;
               {$ENDIF}
-                Value := 0;
               SetPropValue(AObject, PropInfo^.Name, Value);
             end;
           tkSet:

Modified: trunk/Source/ObjectFoundry/OFExpert.pas
===================================================================
--- trunk/Source/ObjectFoundry/OFExpert.pas	2006-03-10 10:56:53 UTC (rev 643)
+++ trunk/Source/ObjectFoundry/OFExpert.pas	2006-03-11 09:13:45 UTC (rev 644)
@@ -33,7 +33,11 @@
 interface
 
 uses
-  Classes, MMIOAPI, OFOptions, SysUtils, MMToolsAPI, OFDefs;
+  Classes,
+  {$IFDEF VER130}
+  Windows,    // Need in D5 for definition of THandle 
+  {$ENDIF}
+  MMIOAPI, OFOptions, SysUtils, MMToolsAPI, OFDefs;
 
 type
   TObjectFoundryExpert = class(TInterfacedObject, IUnknown, IMMExpert, IInstantObjectsExpert)
@@ -87,7 +91,7 @@
 implementation
 
 uses
-  Contnrs, Windows, OFClasses, OFUtils, OFCritic, InstantAttributeEditor,
+  Contnrs, OFClasses, OFUtils, OFCritic, InstantAttributeEditor,
   InstantPersistence, InstantCode, Forms, Controls, Menus, MMEngineDefs,
   OFClassRegWizard, InstantDesignUtils;