[Instantobjects-cvscommit] SF.net SVN: instantobjects: [663] trunk/Source/Design/InstantAttributeEditor.pas

[<fas...@us...>]

Revision: 663
Author:   fastbike2
Date:     2006-04-07 14:25:56 -0700 (Fri, 07 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/instantobjects?rev=663&view=rev

Log Message:
-----------
 [ 1466586 ] Minor Error in Attribute Editor
Force the main definition tabsheet to be active before enabling focus of attribute Name or Size edit controls.

Modified Paths:
--------------
    trunk/Source/Design/InstantAttributeEditor.pas
Modified: trunk/Source/Design/InstantAttributeEditor.pas
===================================================================
--- trunk/Source/Design/InstantAttributeEditor.pas	2006-03-30 22:30:33 UTC (rev 662)
+++ trunk/Source/Design/InstantAttributeEditor.pas	2006-04-07 21:25:56 UTC (rev 663)
@@ -24,7 +24,7 @@
  * the Initial Developer. All Rights Reserved.
  *
  * Contributor(s):
- * Carlo Barazzetta, Adrea Petrelli, Nando Dessena, Steven Mitchell
+ * Carlo Barazzetta, Adrea Petrelli, Nando Dessena, Steven Mitchell, David Moorhouse
  *
  * ***** END LICENSE BLOCK ***** *)
 
@@ -389,8 +389,9 @@
       if (Attribute <> Subject) and SameText(Attribute.Name, Subject.Name) then
       begin
         ModalResult := mrNone;
+        PageControl.ActivePage := DefinitionSheet;
         NameEdit.SetFocus;
-        raise Exception.Create('Name already used');
+        raise Exception.Create('Attribute Name already used');
       end;
     end;
 
@@ -398,6 +399,7 @@
     if not Confirm(SConfirmZeroSizeStringAttribute) then
     begin
       ModalResult := mrNone;
+      PageControl.ActivePage := DefinitionSheet;
       SizeEdit.SetFocus;
       Abort;
     end;