change the functions order to make it more readable

SVN revision: 29928

diff --git a/src/bin/e_widget_ilist.c b/src/bin/e_widget_ilist.c
index 0f53b9f..759e822 100644 (file)
--- a/src/bin/e_widget_ilist.c
+++ b/src/bin/e_widget_ilist.c
@@ -65,71 +65,48 @@ e_widget_ilist_add(Evas *evas, int icon_w, int icon_h, char **value)
 }
 
 EAPI void
-e_widget_ilist_append(Evas_Object *obj, Evas_Object *icon, const char *label, void (*func) (void *data), void *data, const char *val)
+e_widget_ilist_freeze(Evas_Object *obj)
 {
    E_Widget_Data *wd;
-   E_Widget_Callback *wcb;
    
    wd = e_widget_data_get(obj);
-   wcb = E_NEW(E_Widget_Callback, 1);
-   if (!wcb) return;
-   wcb->func = func;
-   wcb->data = data;
-   if (val) wcb->value = strdup(val);
-   wd->callbacks = evas_list_append(wd->callbacks, wcb);
-   e_ilist_append(wd->o_ilist, icon, label, 0, _e_wid_cb_item_sel, _e_wid_cb_item_hilight, wd, wcb);
-   if (icon) evas_object_show(icon);
+   e_ilist_freeze(wd->o_ilist);
 }
 
 EAPI void
-e_widget_ilist_header_append(Evas_Object *obj, Evas_Object *icon, const char *label)
+e_widget_ilist_thaw(Evas_Object *obj)
 {
    E_Widget_Data *wd;
    
    wd = e_widget_data_get(obj);
-   e_ilist_append(wd->o_ilist, icon, label, 1, NULL, NULL, NULL, NULL);
-   if (icon) evas_object_show(icon);
+   e_ilist_thaw(wd->o_ilist);
 }
 
 EAPI void
-e_widget_ilist_selected_set(Evas_Object *obj, int n)
-{
-   E_Widget_Data *wd;
-   
-   wd = e_widget_data_get(obj);
-   e_ilist_selected_set(wd->o_ilist, n);
-}
-
-EAPI int
-e_widget_ilist_selected_get(Evas_Object *obj)
+e_widget_ilist_append(Evas_Object *obj, Evas_Object *icon, const char *label, void (*func) (void *data), void *data, const char *val)
 {
    E_Widget_Data *wd;
+   E_Widget_Callback *wcb;
    
    wd = e_widget_data_get(obj);
-   return e_ilist_selected_get(wd->o_ilist);
+   wcb = E_NEW(E_Widget_Callback, 1);
+   if (!wcb) return;
+   wcb->func = func;
+   wcb->data = data;
+   if (val) wcb->value = strdup(val);
+   wd->callbacks = evas_list_append(wd->callbacks, wcb);
+   e_ilist_append(wd->o_ilist, icon, label, 0, _e_wid_cb_item_sel, _e_wid_cb_item_hilight, wd, wcb);
+   if (icon) evas_object_show(icon);
 }
 
 EAPI void
-e_widget_ilist_unselect(Evas_Object *obj)
-{
-   E_Widget_Data *wd;
-   
-   wd = e_widget_data_get(obj);
-   if ((wd->value) && *(wd->value))
-       {
-          free(*(wd->value));
-          *(wd->value) = NULL;
-       }
-   e_ilist_unselect(wd->o_ilist);
-}
-
-EAPI const char *
-e_widget_ilist_selected_label_get(Evas_Object *obj)
+e_widget_ilist_header_append(Evas_Object *obj, Evas_Object *icon, const char *label)
 {
    E_Widget_Data *wd;
    
    wd = e_widget_data_get(obj);
-   return e_ilist_selected_label_get(wd->o_ilist);
+   e_ilist_append(wd->o_ilist, icon, label, 1, NULL, NULL, NULL, NULL);
+   if (icon) evas_object_show(icon);
 }
 
 EAPI void
@@ -165,30 +142,38 @@ e_widget_ilist_go(Evas_Object *obj)
 }
 
 EAPI void
-e_widget_ilist_remove_num(Evas_Object *obj, int n)
+e_widget_ilist_clear(Evas_Object *obj) 
+{
+   E_Widget_Data *wd;
+   wd = e_widget_data_get(obj);
+   e_ilist_clear(wd->o_ilist);
+}
+
+EAPI int
+e_widget_ilist_count(Evas_Object *obj)
 {
    E_Widget_Data *wd;
    
    wd = e_widget_data_get(obj);
-   e_ilist_remove_num(wd->o_ilist, n);
+   return e_ilist_count(wd->o_ilist);
 }
 
-EAPI void
-e_widget_ilist_remove_label(Evas_Object *obj, const char *label)
+EAPI Evas_List *
+e_widget_ilist_items_get(Evas_Object *obj) 
 {
    E_Widget_Data *wd;
    
    wd = e_widget_data_get(obj);
-   e_ilist_remove_label(wd->o_ilist, label);
+   return e_ilist_items_get(wd->o_ilist);
 }
 
-EAPI const char *
-e_widget_ilist_nth_label_get(Evas_Object *obj, int n)
+EAPI int 
+e_widget_ilist_nth_is_header(Evas_Object *obj, int n) 
 {
-    E_Widget_Data *wd;
+   E_Widget_Data *wd;
    
    wd = e_widget_data_get(obj);
-   return e_ilist_nth_label_get(wd->o_ilist, n);
+   return e_ilist_nth_is_header(wd->o_ilist, n);
 }
 
 EAPI void
@@ -200,6 +185,15 @@ e_widget_ilist_nth_label_set(Evas_Object *obj, int n, const char *label)
    e_ilist_nth_label_set(wd->o_ilist, n, label);
 }
 
+EAPI const char *
+e_widget_ilist_nth_label_get(Evas_Object *obj, int n)
+{
+    E_Widget_Data *wd;
+   
+   wd = e_widget_data_get(obj);
+   return e_ilist_nth_label_get(wd->o_ilist, n);
+}
+
 EAPI void
 e_widget_ilist_nth_icon_set(Evas_Object *obj, int n, Evas_Object *icon)
 {
@@ -233,57 +227,72 @@ e_widget_ilist_nth_data_get(Evas_Object *obj, int n)
      return wcb->data;
 }
 
-EAPI Evas_Object *
-e_widget_ilist_selected_icon_get(Evas_Object *obj)
+EAPI void
+e_widget_ilist_selected_set(Evas_Object *obj, int n)
 {
-    E_Widget_Data *wd;
+   E_Widget_Data *wd;
    
    wd = e_widget_data_get(obj);
-   return e_ilist_selected_icon_get(wd->o_ilist);
+   e_ilist_selected_set(wd->o_ilist, n);
 }
 
 EAPI int
-e_widget_ilist_count(Evas_Object *obj)
+e_widget_ilist_selected_get(Evas_Object *obj)
 {
    E_Widget_Data *wd;
    
    wd = e_widget_data_get(obj);
-   return e_ilist_count(wd->o_ilist);
+   return e_ilist_selected_get(wd->o_ilist);
 }
 
-EAPI void
-e_widget_ilist_clear(Evas_Object *obj) 
+EAPI const char *
+e_widget_ilist_selected_label_get(Evas_Object *obj)
 {
    E_Widget_Data *wd;
+   
    wd = e_widget_data_get(obj);
-   e_ilist_clear(wd->o_ilist);
+   return e_ilist_selected_label_get(wd->o_ilist);
 }
 
-EAPI int 
-e_widget_ilist_nth_is_header(Evas_Object *obj, int n) 
+EAPI Evas_Object *
+e_widget_ilist_selected_icon_get(Evas_Object *obj)
+{
+    E_Widget_Data *wd;
+   
+   wd = e_widget_data_get(obj);
+   return e_ilist_selected_icon_get(wd->o_ilist);
+}
+
+EAPI void
+e_widget_ilist_unselect(Evas_Object *obj)
 {
    E_Widget_Data *wd;
    
    wd = e_widget_data_get(obj);
-   return e_ilist_nth_is_header(wd->o_ilist, n);
+   if ((wd->value) && *(wd->value))
+       {
+          free(*(wd->value));
+          *(wd->value) = NULL;
+       }
+   e_ilist_unselect(wd->o_ilist);
 }
 
 EAPI void
-e_widget_ilist_freeze(Evas_Object *obj)
+e_widget_ilist_remove_num(Evas_Object *obj, int n)
 {
    E_Widget_Data *wd;
    
    wd = e_widget_data_get(obj);
-   e_ilist_freeze(wd->o_ilist);
+   e_ilist_remove_num(wd->o_ilist, n);
 }
 
 EAPI void
-e_widget_ilist_thaw(Evas_Object *obj)
+e_widget_ilist_remove_label(Evas_Object *obj, const char *label)
 {
    E_Widget_Data *wd;
    
    wd = e_widget_data_get(obj);
-   e_ilist_thaw(wd->o_ilist);
+   e_ilist_remove_label(wd->o_ilist, label);
 }
 
 EAPI void 
@@ -304,15 +313,6 @@ e_widget_ilist_multi_select_get(Evas_Object *obj)
    return e_ilist_multi_select_get(wd->o_ilist);
 }
 
-EAPI Evas_List *
-e_widget_ilist_items_get(Evas_Object *obj) 
-{
-   E_Widget_Data *wd;
-   
-   wd = e_widget_data_get(obj);
-   return e_ilist_items_get(wd->o_ilist);
-}
-
 EAPI void 
 e_widget_ilist_multi_select(Evas_Object *obj, int n) 
 {

diff --git a/src/bin/e_widget_ilist.h b/src/bin/e_widget_ilist.h
index b8ea845..7241bf5 100644 (file)
--- a/src/bin/e_widget_ilist.h
+++ b/src/bin/e_widget_ilist.h
@@ -7,30 +7,30 @@
 #define E_WIDGET_ILIST_H
 
 EAPI Evas_Object *e_widget_ilist_add(Evas *evas, int icon_w, int icon_h, char **value);
+EAPI void         e_widget_ilist_freeze(Evas_Object *obj);
+EAPI void         e_widget_ilist_thaw(Evas_Object *obj);
 EAPI void         e_widget_ilist_append(Evas_Object *obj, Evas_Object *icon, const char *label, void (*func) (void *data), void *data, const char *val);
 EAPI void         e_widget_ilist_header_append(Evas_Object *obj, Evas_Object *icon, const char *label);
-EAPI void         e_widget_ilist_selected_set(Evas_Object *obj, int n);
 EAPI void         e_widget_ilist_selector_set(Evas_Object *obj, int selector);
 EAPI void         e_widget_ilist_go(Evas_Object *obj);
-EAPI int          e_widget_ilist_selected_get(Evas_Object *obj);
-EAPI void         e_widget_ilist_unselect(Evas_Object *obj);
-EAPI const char  *e_widget_ilist_selected_label_get(Evas_Object *obj);
-EAPI void         e_widget_ilist_remove_num(Evas_Object *obj, int n);
-EAPI void         e_widget_ilist_remove_label(Evas_Object *obj, const char *label);
-EAPI const char  *e_widget_ilist_nth_label_get(Evas_Object *obj, int n);
+EAPI void         e_widget_ilist_clear(Evas_Object *obj);
+EAPI int          e_widget_ilist_count(Evas_Object *obj);
+EAPI Evas_List   *e_widget_ilist_items_get(Evas_Object *obj);
+EAPI int          e_widget_ilist_nth_is_header(Evas_Object *obj, int n);
 EAPI void         e_widget_ilist_nth_label_set(Evas_Object *obj, int n, const char *label);
+EAPI const char  *e_widget_ilist_nth_label_get(Evas_Object *obj, int n);
 EAPI void         e_widget_ilist_nth_icon_set(Evas_Object *obj, int n, Evas_Object *icon);
 EAPI Evas_Object *e_widget_ilist_nth_icon_get(Evas_Object *obj, int n);
-EAPI Evas_Object *e_widget_ilist_selected_icon_get(Evas_Object *obj);
-EAPI int          e_widget_ilist_count(Evas_Object *obj);
-EAPI void         e_widget_ilist_clear(Evas_Object *obj);
-EAPI int          e_widget_ilist_nth_is_header(Evas_Object *obj, int n);
 EAPI void        *e_widget_ilist_nth_data_get(Evas_Object *obj, int n);
-EAPI void         e_widget_ilist_freeze(Evas_Object *obj);
-EAPI void         e_widget_ilist_thaw(Evas_Object *obj);
+EAPI void         e_widget_ilist_selected_set(Evas_Object *obj, int n);
+EAPI int          e_widget_ilist_selected_get(Evas_Object *obj);
+EAPI const char  *e_widget_ilist_selected_label_get(Evas_Object *obj);
+EAPI Evas_Object *e_widget_ilist_selected_icon_get(Evas_Object *obj);
+EAPI void         e_widget_ilist_unselect(Evas_Object *obj);
+EAPI void         e_widget_ilist_remove_num(Evas_Object *obj, int n);
+EAPI void         e_widget_ilist_remove_label(Evas_Object *obj, const char *label);
 EAPI void         e_widget_ilist_multi_select_set(Evas_Object *obj, int multi);
 EAPI int          e_widget_ilist_multi_select_get(Evas_Object *obj);
-EAPI Evas_List   *e_widget_ilist_items_get(Evas_Object *obj);
 EAPI void         e_widget_ilist_multi_select(Evas_Object *obj, int n);
 EAPI void         e_widget_ilist_range_select(Evas_Object *obj, int n);