Enlightenment CVS committal
Author : leviathan
Project : e17
Module : proto
Dir : e17/proto/etk-perl
Modified Files:
Etk.xs EtkTypes.c
Log Message:
- etk_test is working correctly again.
===================================================================
RCS file: /cvs/e/e17/proto/etk-perl/Etk.xs,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -3 -r1.35 -r1.36
--- Etk.xs 4 Aug 2006 14:50:37 -0000 1.35
+++ Etk.xs 4 Aug 2006 17:23:01 -0000 1.36
@@ -927,14 +927,9 @@
for(i = 0; i < items - 1; i++)
{
if(SvPOK(ST(i + 1)))
- {
ptr[i] = SvPV_nolen(ST(i + 1));
- }
- else if (sv_derived_from(ST(i + 1), "Etk_WidgetPtr"))
- {
- IV tmp = SvIV((SV*)SvRV(ST(i + 1)));
- ptr[i] = INT2PTR(Etk_Widget *,tmp);
- }
+ else
+ ptr[i] = SvEtkWidgetPtr(ST(i + 1));
}
switch(items)
{
@@ -1002,14 +997,9 @@
for(i = 0; i < items - 1; i++)
{
if(SvPOK(ST(i + 1)))
- {
ptr[i] = SvPV_nolen(ST(i + 1));
- }
- else if (sv_derived_from(ST(i + 1), "Etk_WidgetPtr"))
- {
- IV tmp = SvIV((SV*)SvRV(ST(i + 1)));
- ptr[i] = INT2PTR(Etk_Widget *,tmp);
- }
+ else
+ ptr[i] = SvEtkWidgetPtr(ST(i + 1));
}
switch(items)
{
@@ -1080,15 +1070,10 @@
*/
for(i = 0; i < items - 2; i++)
{
- if(SvPOK(ST(i + 2)))
- {
- ptr[i] = SvPV_nolen(ST(i + 2));
- }
- else if (sv_derived_from(ST(i + 2), "Etk_WidgetPtr"))
- {
- IV tmp = SvIV((SV*)SvRV(ST(i + 2)));
- ptr[i] = INT2PTR(Etk_Widget *,tmp);
- }
+ if(SvPOK(ST(i + 1)))
+ ptr[i] = SvPV_nolen(ST(i + 1));
+ else
+ ptr[i] = SvEtkWidgetPtr(ST(i + 1));
}
switch(items)
{
@@ -1172,15 +1157,10 @@
*/
for(i = 0; i < items - 2; i++)
{
- if(SvPOK(ST(i + 2)))
- {
- ptr[i] = SvPV_nolen(ST(i + 2));
- }
- else if (sv_derived_from(ST(i + 2), "Etk_WidgetPtr"))
- {
- IV tmp = SvIV((SV*)SvRV(ST(i + 2)));
- ptr[i] = INT2PTR(Etk_Widget *,tmp);
- }
+ if(SvPOK(ST(i + 1)))
+ ptr[i] = SvPV_nolen(ST(i + 1));
+ else
+ ptr[i] = SvEtkWidgetPtr(ST(i + 1));
}
switch(items)
{
@@ -3036,7 +3016,7 @@
etk_signal_stop()
-MODULE = Etk::StatusBar PACKAGE = Etk::StaturBar PREFIX =
etk_statusbar_
+MODULE = Etk::StatusBar PACKAGE = Etk::StatusBar PREFIX =
etk_statusbar_
int
etk_statusbar_context_id_get(statusbar, context)
===================================================================
RCS file: /cvs/e/e17/proto/etk-perl/EtkTypes.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- EtkTypes.c 4 Aug 2006 14:50:37 -0000 1.2
+++ EtkTypes.c 4 Aug 2006 17:23:01 -0000 1.3
@@ -101,6 +101,8 @@
__("ProgressBar", "Widget");
__("Range", "Widget");
__("Slider", "Range");
+ __("HSlider", "Slider");
+ __("VSlider", "Slider");
__("Spearator", "Widget");
__("HSeparator", "Spearator");
__("VSeparator", "Spearator");
-------------------------------------------------------------------------
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
