Enlightenment CVS committal
Author : rbdpngn
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src
Modified Files:
Ewl.h Makefile.am ewl_button.c ewl_container.c ewl_seeker.c
ewl_tree.c
Added Files:
ewl_progressbar.c ewl_progressbar.h
Log Message:
Added a progressbar widget from Martin "balony" Sarajervi, still need to put
together theme edjes for it. Sanity checks in the container code, moved the
headers of the tree outside of the scrollpane.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/Ewl.h,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -3 -r1.40 -r1.41
--- Ewl.h 10 Nov 2003 16:25:50 -0000 1.40
+++ Ewl.h 10 Nov 2003 22:55:27 -0000 1.41
@@ -296,6 +296,7 @@
#include <ewl_cursor.h>
#include <ewl_separator.h>
#include <ewl_notebook.h>
+#include <ewl_progressbar.h>
#include <ewl_scrollpane.h>
#include <ewl_textarea.h>
#include <ewl_selectionbar.h>
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/Makefile.am,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -3 -r1.35 -r1.36
--- Makefile.am 13 Jul 2003 05:52:49 -0000 1.35
+++ Makefile.am 10 Nov 2003 22:55:27 -0000 1.36
@@ -34,6 +34,7 @@
ewl_misc.h \
ewl_notebook.h \
ewl_object.h \
+ ewl_progressbar.h \
ewl_radiobutton.h \
ewl_row.h \
ewl_scrollbar.h \
@@ -77,6 +78,7 @@
ewl_misc.c \
ewl_notebook.c \
ewl_object.c \
+ ewl_progressbar.c \
ewl_radiobutton.c \
ewl_row.c \
ewl_scrollbar.c \
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_button.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -3 -r1.49 -r1.50
--- ewl_button.c 10 Nov 2003 16:25:50 -0000 1.49
+++ ewl_button.c 10 Nov 2003 22:55:27 -0000 1.50
@@ -96,7 +96,7 @@
DENTER_FUNCTION(DLEVEL_STABLE);
if (b->label_object)
- val = ewl_text_get_text(b->label_object);
+ val = ewl_text_get_text(EWL_TEXT(b->label_object));
DRETURN_PTR(val, DLEVEL_STABLE);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_container.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -3 -r1.50 -r1.51
--- ewl_container.c 5 Nov 2003 08:29:33 -0000 1.50
+++ ewl_container.c 10 Nov 2003 22:55:27 -0000 1.51
@@ -137,7 +137,12 @@
DCHECK_PARAM_PTR("pc", pc);
DCHECK_PARAM_PTR("child", child);
- if (ewd_list_is_empty(pc->children))
+ if (ewl_container_parent_of(child, EWL_WIDGET(pc))) {
+ DWARNING("Attempting to make a child a parent of itself");
+ DRETURN(DLEVEL_STABLE);
+ }
+
+ if (ewd_list_is_empty(pc->children) && pc->clip_box)
evas_object_show(pc->clip_box);
ewd_list_append(pc->children, child);
@@ -161,7 +166,12 @@
DCHECK_PARAM_PTR("pc", pc);
DCHECK_PARAM_PTR("child", child);
- if (ewd_list_is_empty(pc->children))
+ if (ewl_container_parent_of(child, EWL_WIDGET(pc))) {
+ DWARNING("Attempting to make a child a parent of itself");
+ DRETURN(DLEVEL_STABLE);
+ }
+
+ if (ewd_list_is_empty(pc->children) && pc->clip_box)
evas_object_show(pc->clip_box);
ewd_list_prepend(pc->children, child);
@@ -188,7 +198,12 @@
DCHECK_PARAM_PTR("pc", pc);
DCHECK_PARAM_PTR("child", child);
- if (ewd_list_is_empty(pc->children))
+ if (ewl_container_parent_of(child, EWL_WIDGET(pc))) {
+ DWARNING("Attempting to make a child a parent of itself");
+ DRETURN(DLEVEL_STABLE);
+ }
+
+ if (ewd_list_is_empty(pc->children) && pc->clip_box)
evas_object_show(pc->clip_box);
ewd_list_goto_index(pc->children, index);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_seeker.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -3 -r1.45 -r1.46
--- ewl_seeker.c 18 Oct 2003 17:00:36 -0000 1.45
+++ ewl_seeker.c 10 Nov 2003 22:55:27 -0000 1.46
@@ -10,10 +10,6 @@
void *user_data);
void __ewl_seeker_mouse_down(Ewl_Widget * w, void *ev_data,
void *user_data);
-void __ewl_seeker_focus_in(Ewl_Widget * w, void *ev_data,
- void *user_data);
-void __ewl_seeker_focus_out(Ewl_Widget * w, void *ev_data,
- void *user_data);
/**
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_tree.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- ewl_tree.c 28 Oct 2003 18:49:34 -0000 1.23
+++ ewl_tree.c 10 Nov 2003 22:55:27 -0000 1.24
@@ -480,7 +480,7 @@
DENTER_FUNCTION(DLEVEL_STABLE);
t = EWL_TREE(c);
- if (w != t->scrollarea)
+ if (w != t->scrollarea && w != t->header)
ewl_container_append_child(EWL_CONTAINER(t->scrollarea), w);
DLEAVE_FUNCTION(DLEVEL_STABLE);
-------------------------------------------------------
This SF.Net email sponsored by: ApacheCon 2003,
16-19 November in Las Vegas. Learn firsthand the latest
developments in Apache, PHP, Perl, XML, Java, MySQL,
WebDAV, and more! http://www.apachecon.com/
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
