Enlightenment CVS committal
Author : leviathan
Project : e17
Module : proto
Dir : e17/proto/etk-perl/lib/Etk/Menu/Item
Modified Files:
Check.pm Image.pm Radio.pm
Log Message:
- back to stable again.
- new Constants for all consts
- Stock can export its constants too
- more simplifications in etk_test.pl
===================================================================
RCS file: /cvs/e/e17/proto/etk-perl/lib/Etk/Menu/Item/Check.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- Check.pm 7 Jun 2006 11:58:34 -0000 1.1
+++ Check.pm 20 Jul 2006 23:16:22 -0000 1.2
@@ -7,12 +7,9 @@
{
my $class = shift;
my $self = $class->SUPER::new();
- if(@_ == 1)
- {
+ if(@_ == 1) {
$self->{WIDGET} = Etk::etk_menu_item_check_new_with_label(shift);
- }
- else
- {
+ } else {
$self->{WIDGET} = Etk::etk_menu_item_check_new();
}
bless($self, $class);
@@ -24,6 +21,7 @@
my $self = shift;
my $active = shift;
Etk::etk_menu_item_check_active_set($self->{WIDGET}, $active);
+ return $self;
}
sub ActiveGet
===================================================================
RCS file: /cvs/e/e17/proto/etk-perl/lib/Etk/Menu/Item/Image.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- Image.pm 17 Jul 2006 23:26:17 -0000 1.2
+++ Image.pm 20 Jul 2006 23:16:22 -0000 1.3
@@ -9,9 +9,9 @@
my $self = $class->SUPER::new();
if(@_ == 1) {
my $arg = shift;
- $self->{WIDGET} = $arg + 0 eq $arg ?
- Etk::etk_menu_item_image_new_from_stock($arg):
- Etk::etk_menu_item_image_new_with_label($arg);
+ $self->{WIDGET} = $arg =~ /\D/ ?
+ Etk::etk_menu_item_image_new_with_label($arg):
+ Etk::etk_menu_item_image_new_from_stock($arg);
} else {
$self->{WIDGET} = Etk::etk_menu_item_image_new();
}
@@ -24,6 +24,7 @@
my $self = shift;
my $image = shift;
Etk::etk_menu_item_image_set($self->{WIDGET}, $image->{WIDGET});
+ return $self;
}
1;
===================================================================
RCS file: /cvs/e/e17/proto/etk-perl/lib/Etk/Menu/Item/Radio.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- Radio.pm 28 Jun 2006 00:18:37 -0000 1.2
+++ Radio.pm 20 Jul 2006 23:16:22 -0000 1.3
@@ -9,37 +9,27 @@
my $self = $class->SUPER::new();
my $widget;
- if(@_ >= 1)
- {
+ if(@_ >= 1) {
my $data = shift;
- if (ref $data)
- {
+ if (ref $data) {
$self->{WIDGET} =
Etk::etk_menu_item_radio_new_from_widget($data->{WIDGET});
$widget = $data;
- }
- else
- {
- if (@_)
- {
+ } else {
+ if (@_) {
my $data2 = shift;
$self->{WIDGET} =
Etk::etk_menu_item_radio_new_with_label_from_widget(
$data, $data2->{WIDGET});
$widget = $data2;
- }
- else
- {
+ } else {
$self->{WIDGET} =
Etk::etk_menu_item_radio_new_with_label($data);
}
}
}
bless($self, $class);
- if ($widget)
- {
+ if ($widget) {
push @{$widget->{GROUP}}, $self;
$self->{GROUP} = $widget->{GROUP};
- }
- else
- {
+ } else {
push @{$self->{GROUP}}, $self;
}
return $self;
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
