--- deliantra/Deliantra-Client/DC/Macro.pm	2006/12/09 23:06:39	1.5
+++ deliantra/Deliantra-Client/DC/Macro.pm	2007/07/21 20:05:37	1.8
@@ -223,20 +223,20 @@
          child => (my $editor = new CFPlus::UI::Table col_expand => [0, 1]),
       );
 
-      $editor->add (0, 1, new CFPlus::UI::Label
+      $editor->add_at (0, 1, new CFPlus::UI::Label
          text    => "Trigger",
          tooltip => $tooltip_trigger,
          can_hover  => 1,
          can_events => 1,
       );
-      $editor->add (0, 2, new CFPlus::UI::Label
+      $editor->add_at (0, 2, new CFPlus::UI::Label
          text    => "Actions",
          tooltip => $tooltip_commands,
          can_hover  => 1,
          can_events => 1,
       );
 
-      $editor->add (1, 2, my $textedit = new CFPlus::UI::TextEdit
+      $editor->add_at (1, 2, my $textedit = new CFPlus::UI::TextEdit
          text    => macro_to_text $macro,
          tooltip => $tooltip_commands,
          on_changed => sub {
@@ -244,7 +244,7 @@
          },
       );
 
-      $editor->add (1, 1, my $accel = new CFPlus::UI::Button
+      $editor->add_at (1, 1, my $accel = new CFPlus::UI::Button
          text    => trigger_to_string $macro,
          tooltip => "To change the trigger for a macro, activate this button.",
          on_activate => sub {
@@ -257,7 +257,7 @@
       );
 
       my $recording;
-      $editor->add (1, 3, new CFPlus::UI::Button
+      $editor->add_at (1, 3, new CFPlus::UI::Button
          text    => "Start Recording",
          tooltip => "Start/Stop command recording: when recording, "
                   . "actions and commands you invoke are appended to this macro. "
@@ -271,9 +271,8 @@
             $recording = $::CONN && !$recording;
             if ($recording) {
                $widget->set_text ("Stop Recording");
-               my $action = $macro->{action} ||= [];
                $::CONN->record (sub {
-                  push @$action, $_[0];
+                  push @{ $macro->{action} }, $_[0];
                   $textedit->set_text (macro_to_text $macro);
                }) if $::CONN;
             } else {
@@ -299,12 +298,12 @@
    $REFRESH_MACRO_LIST = $refresh = sub {
       $macrolist->clear;
 
-      $macrolist->add (0, 1, new CFPlus::UI::Label
+      $macrolist->add_at (0, 1, new CFPlus::UI::Label
          text    => "Trigger",
          align   => 0,
          tooltip => $tooltip_trigger . $tooltip_common,
       );
-      $macrolist->add (1, 1, new CFPlus::UI::Label
+      $macrolist->add_at (1, 1, new CFPlus::UI::Label
          text    => "Commands",
          tooltip => $tooltip_commands . $tooltip_common,
       );
@@ -339,7 +338,7 @@
             1
          };
 
-         $macrolist->add (0, $y, new CFPlus::UI::Label
+         $macrolist->add_at (0, $y, new CFPlus::UI::Label
             text       => trigger_to_string $macro,
             tooltip    => $tooltip_trigger . $tooltip_common,
             align      => 0,
@@ -348,7 +347,7 @@
             on_button_down => $macro_cb,
          );
 
-         $macrolist->add (1, $y, new CFPlus::UI::Label
+         $macrolist->add_at (1, $y, new CFPlus::UI::Label
             text       => (join "; ", @{ $macro->{action} || [] }),
             tooltip    => $tooltip_commands . $tooltip_common,
             expand     => 1,