[Instantobjects-cvscommit] Source/Design InstantAttributeEditor.dfm,1.3,1.4 InstantAttributeEditor.pas,1.6,1.7

[Carlo B. <car...@us...>]

Update of /cvsroot/instantobjects/Source/Design
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31524/Source/Design

Modified Files:
	InstantAttributeEditor.dfm InstantAttributeEditor.pas 
Log Message:
Added Steve Mitchell changes for MM compatibility

Index: InstantAttributeEditor.dfm
===================================================================
RCS file: /cvsroot/instantobjects/Source/Design/InstantAttributeEditor.dfm,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** InstantAttributeEditor.dfm	10 Sep 2004 10:27:39 -0000	1.3
--- InstantAttributeEditor.dfm	1 Nov 2004 08:25:44 -0000	1.4
***************
*** 1,5 ****
  inherited InstantAttributeEditorForm: TInstantAttributeEditorForm
!   Left = 795
!   Top = 191
    Width = 249
    Height = 386
--- 1,5 ----
  inherited InstantAttributeEditorForm: TInstantAttributeEditorForm
!   Left = 229
!   Top = 215
    Width = 249
    Height = 386
***************
*** 12,21 ****
    inherited EditPanel: TPanel
      Width = 241
!     Height = 328
      object PageControl: TPageControl
        Left = 4
        Top = 4
        Width = 233
!       Height = 320
        ActivePage = DefinitionSheet
        Align = alClient
--- 12,21 ----
    inherited EditPanel: TPanel
      Width = 241
!     Height = 321
      object PageControl: TPageControl
        Left = 4
        Top = 4
        Width = 233
!       Height = 313
        ActivePage = DefinitionSheet
        Align = alClient
***************
*** 389,393 ****
    end
    inherited BottomPanel: TPanel
!     Top = 328
      Width = 241
      inherited ButtonPanel: TPanel
--- 389,393 ----
    end
    inherited BottomPanel: TPanel
!     Top = 321
      Width = 241
      inherited ButtonPanel: TPanel

Index: InstantAttributeEditor.pas
===================================================================
RCS file: /cvsroot/instantobjects/Source/Design/InstantAttributeEditor.pas,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** InstantAttributeEditor.pas	30 Sep 2004 14:45:09 -0000	1.6
--- InstantAttributeEditor.pas	1 Nov 2004 08:25:44 -0000	1.7
***************
*** 460,472 ****
  var
    HasName, HasClass, HasExternalStoredName, HasExternalLinkedName: Boolean;
!   IsComplex, IsContainer, CanBeExternal, IsExternal, IsMaskable, IsString, IsValid: Boolean;
  begin
!   CanBeExternal := Subject.AttributeType in [atPart, atParts, atReferences];
!   if not CanBeExternal then
      Subject.IsExternal := ceNo;
!   if Subject.IsExternal = ceLinked then
!     Subject.ExternalStoredName := '';
!   if Subject.IsExternal = ceStored then
!     Subject.ExternalLinkedName := '';
  
    HasName := NameEdit.Text <> '';
--- 460,469 ----
  var
    HasName, HasClass, HasExternalStoredName, HasExternalLinkedName: Boolean;
!   IsComplex, IsContainer, IsExternal, IsMaskable, IsString, IsValid: Boolean;
  begin
!   if (Subject.AttributeType<>atParts) and (Subject.AttributeType<>atReferences) then
      Subject.IsExternal := ceNo;
!   if Subject.IsExternal = ceLinked then Subject.ExternalStoredName := '';
!   if Subject.IsExternal = ceStored then Subject.ExternalLinkedName := '';
  
    HasName := NameEdit.Text <> '';
***************
*** 481,485 ****
    IsString := Subject.AttributeType in [atString, atMemo];
    IsValid := HasName and (not IsComplex or HasClass) and
!     (not IsExternal or (HasExternalStoredName or HasExternalLinkedName));
  
    DisableSubControls(DefinitionSheet, Limited);
--- 478,482 ----
    IsString := Subject.AttributeType in [atString, atMemo];
    IsValid := HasName and (not IsComplex or HasClass) and
!     (not IsExternal or (HasExternalStoredName or HasExternalLinkedName) );
  
    DisableSubControls(DefinitionSheet, Limited);
***************
*** 499,512 ****
      EnableCtrl(MethodInsertCheckBox, IsContainer);
      EnableCtrl(MethodRemoveCheckBox, IsContainer);
!     EnableCtrl(IsExternalEdit, CanBeExternal);
!     EnableCtrl(IsExternalLabel, CanBeExternal);
    end;
!   EnableCtrl(StorageNameLabel, not IsExternal);
!   EnableCtrl(StorageNameEdit, not IsExternal);
  
!   EnableCtrl(ExternalLinkedNameLabel, IsExternal and (Subject.IsExternal = ceLinked));
!   EnableCtrl(ExternalLinkedNameEdit, IsExternal and (Subject.IsExternal = ceLinked));
!   EnableCtrl(ExternalStoredNameLabel, IsExternal and (Subject.IsExternal = ceStored));
!   EnableCtrl(ExternalStoredNameEdit, IsExternal and (Subject.IsExternal = ceStored));
  
    EnableCtrl(SizeLabel, IsString);
--- 496,510 ----
      EnableCtrl(MethodInsertCheckBox, IsContainer);
      EnableCtrl(MethodRemoveCheckBox, IsContainer);
! 
!     EnableCtrl(IsExternalEdit, IsContainer);
!     EnableCtrl(IsExternalLabel, IsContainer);
    end;
!   EnableCtrl(StorageNameLabel, not (IsContainer and IsExternal) );
!   EnableCtrl(StorageNameEdit, not (IsContainer and IsExternal) );
  
!   EnableCtrl(ExternalLinkedNameLabel, IsContainer and (Subject.IsExternal=ceLinked) );
!   EnableCtrl(ExternalLinkedNameEdit, IsContainer and (Subject.IsExternal=ceLinked) );
!   EnableCtrl(ExternalStoredNameLabel, IsContainer and (Subject.IsExternal=ceStored) );
!   EnableCtrl(ExternalStoredNameEdit, IsContainer and (Subject.IsExternal=ceStored) );
  
    EnableCtrl(SizeLabel, IsString);