[JVCL-Checkins] SF.net SVN: jvcl: [10662] trunk/jvcl/run/JvXPBar.pas

[<ob...@us...>]

Revision: 10662
Author:   obones
Date:     2006-06-08 02:33:28 -0700 (Thu, 08 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/jvcl/?rev=10662&view=rev

Log Message:
-----------
Mantis 3244: Now allows to change the caption after having set the action.

Modified Paths:
--------------
    trunk/jvcl/run/JvXPBar.pas
Modified: trunk/jvcl/run/JvXPBar.pas
===================================================================
--- trunk/jvcl/run/JvXPBar.pas	2006-06-08 08:28:16 UTC (rev 10661)
+++ trunk/jvcl/run/JvXPBar.pas	2006-06-08 09:33:28 UTC (rev 10662)
@@ -877,13 +877,13 @@
         Update;
       {$IFDEF VCL}
       {$IFDEF COMPILER6_UP}
-      if not CheckDefaults or (Self.AutoCheck = False) then
+      if not CheckDefaults or not Self.AutoCheck then
         Self.AutoCheck := AutoCheck;
       {$ENDIF COMPILER6_UP}
       {$ENDIF VCL}
       if not CheckDefaults or (Self.Caption = '') or (Self.Caption = Self.Name) then
         Self.Caption := Caption;
-      if not CheckDefaults or (Self.Checked = False) then
+      if not CheckDefaults or not Self.Checked then
         Self.Checked := Checked;
       if not CheckDefaults or Self.Enabled then
         Self.Enabled := Enabled;
@@ -2453,8 +2453,12 @@
 begin
   inherited InitiateAction;
   // go through each item and update
+  // Note: Do not call ActionChange as it would trigger Mantis 3244 and it is
+  // basically wrong as the point of InitiateAction is to call Update (see in
+  // the inherited code).
   for I := 0 to Items.Count - 1 do
-    Items[I].ActionChange(Items[I].Action, csLoading in ComponentState);
+    if Assigned(Items[I].ActionLink) then
+      Items[I].ActionLink.Update;
 end;
 
 {$IFDEF VCL}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.