Enlightenment CVS committal Author : codewarrior Project : e17 Module : proto
Dir : e17/proto/etk-perl/lib/Etk Modified Files: Box.pm Object.pm Timer.pm Log Message: - dont use (shift || foo) (fixes chady's packing problem) - fix timers now that they have their own structs - formatting =================================================================== RCS file: /cvs/e/e17/proto/etk-perl/lib/Etk/Box.pm,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- Box.pm 7 Jun 2006 11:58:33 -0000 1.1 +++ Box.pm 11 Jun 2006 00:26:32 -0000 1.2 @@ -15,9 +15,12 @@ { my $self = shift; my $child = shift; - my $expand = shift || 1; - my $fill = shift || 1; - my $padding = shift || 0; + my $expand = 1; + $expand = shift if(@_ > 0); + my $fill = 1; + $fill = shift if(@_ > 0); + my $padding = 0; + $padding = shift if(@_ > 0); Etk::etk_box_pack_start($self->{WIDGET}, $child->{WIDGET}, $expand, $fill, $padding); } @@ -26,9 +29,12 @@ { my $self = shift; my $child = shift; - my $expand = shift || 1; - my $fill = shift || 1; - my $padding = shift || 0; + my $expand = 1; + $expand = shift if(@_ > 0); + my $fill = 1; + $fill = shift if(@_ > 0); + my $padding = 0; + $padding = shift if(@_ > 0); Etk::etk_box_pack_end($self->{WIDGET}, $child->{WIDGET}, $expand, $fill, $padding); } =================================================================== RCS file: /cvs/e/e17/proto/etk-perl/lib/Etk/Object.pm,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- Object.pm 10 Jun 2006 11:04:55 -0000 1.4 +++ Object.pm 11 Jun 2006 00:26:32 -0000 1.5 @@ -13,9 +13,12 @@ { my $self = shift; my ($type, $mem) = split /=/, "$self->{WIDGET}"; - # confess "usage: \$object->SignalConnect(\"sig_name\", \\&callback)" unless (@_ == 2); - Etk::etk_signal_connect(shift, - bless($self->{WIDGET}, "Etk_WidgetPtr"), shift, shift || undef); + my $signal_name = shift; + my $callback = shift; + my $data = undef; + $data = shift if (@_ > 0); + Etk::etk_signal_connect($signal_name, + bless($self->{WIDGET}, "Etk_WidgetPtr"), $callback, $data); bless($self->{WIDGET}, $type); } =================================================================== RCS file: /cvs/e/e17/proto/etk-perl/lib/Etk/Timer.pm,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- Timer.pm 7 Jun 2006 22:26:47 -0000 1.1 +++ Timer.pm 11 Jun 2006 00:26:32 -0000 1.2 @@ -6,7 +6,10 @@ my $class = shift; my $self = {}; my $interval = shift; - $self->{WIDGET} = Etk::etkpl_timer_add($interval, shift); + my $callback = shift; + my $data = undef; + $data = shift if (@_ > 0); + $self->{WIDGET} = Etk::etkpl_timer_add($interval, $callback, $data); bless($self, $class); return $self; } _______________________________________________ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs