Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_button_stock.c ewl_fileselector.c ewl_fileselector.h
Log Message:
- make this consistent with the way the rest of ewl is written
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_button_stock.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- ewl_button_stock.c 9 Feb 2005 04:31:54 -0000 1.1
+++ ewl_button_stock.c 11 Feb 2005 18:10:52 -0000 1.2
@@ -161,7 +161,7 @@
ewl_callback_append (button,
EWL_CALLBACK_CLICKED,
- EWL_CALLBACK_FUNCTION (ewl_button_stock_click_cb),
+ ewl_button_stock_click_cb,
&(EWL_BUTTON_STOCK (button)->response_id));
DRETURN_PTR(button, DLEVEL_STABLE);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_fileselector.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- ewl_fileselector.c 10 Feb 2005 19:55:24 -0000 1.2
+++ ewl_fileselector.c 11 Feb 2005 18:10:53 -0000 1.3
@@ -97,16 +97,14 @@
button = ewl_button_stock_with_id_new(EWL_STOCK_ARROW_UP,
EWL_RESPONSE_ARROW_UP);
ewl_callback_append(button, EWL_CALLBACK_CLICKED,
-
EWL_CALLBACK_FUNCTION(ewl_fileselector_go_up_cb),
- fs);
+ ewl_fileselector_go_up_cb, fs);
ewl_container_child_append(EWL_CONTAINER(hbox), button);
ewl_widget_show(button);
button = ewl_button_stock_with_id_new(EWL_STOCK_HOME,
EWL_RESPONSE_HOME);
ewl_callback_append(button, EWL_CALLBACK_CLICKED,
- EWL_CALLBACK_FUNCTION
- (ewl_fileselector_go_home_cb), fs);
+ ewl_fileselector_go_home_cb, fs);
ewl_container_child_append(EWL_CONTAINER(hbox), button);
ewl_widget_show(button);
@@ -474,21 +472,25 @@
ewl_widget_destroy(EWL_WIDGET(user_data));
}
-void ewl_fileselector_select_file_cb(Ewl_Widget * w, void *ev_data,
Ewl_Fileselector * fs)
+void ewl_fileselector_select_file_cb(Ewl_Widget * w, void *ev_data, void *data)
{
+ Ewl_Fileselector *fs;
Ewl_Fileselector_Data *d = NULL;
+ fs = data;
d = (Ewl_Fileselector_Data *) ewl_widget_data_get(EWL_WIDGET(w),
"FILE");
IF_FREE(fs->file);
fs->file = strdup( d->name );
ewl_entry_text_set(EWL_ENTRY(fs->entry_file), d->name);
}
-void ewl_fileselector_select_dir_cb(Ewl_Widget * w, void *ev_data,
Ewl_Fileselector * fs)
+void ewl_fileselector_select_dir_cb(Ewl_Widget * w, void *ev_data, void *data)
{
+ Ewl_Fileselector *fs;
char *path;
char *new_path;
+ fs = data;
path = (char *) ewl_widget_data_get(EWL_WIDGET(w), "DIR");
if (!strcmp(path, ".."))
new_path = ewl_fileselector_path_up_get(fs->path);
@@ -499,18 +501,22 @@
ewl_fileselector_path_setup(EWL_FILESELECTOR(fs), path);
}
-void ewl_fileselector_go_up_cb(Ewl_Widget * w, void *ev_data, Ewl_Fileselector
* fs)
+void ewl_fileselector_go_up_cb(Ewl_Widget * w, void *ev_data, void *data)
{
+ Ewl_Fileselector *fs;
char *path;
+ fs = data;
path = ewl_fileselector_path_up_get(fs->path);
ewl_fileselector_path_setup(EWL_FILESELECTOR(fs), path);
}
-void ewl_fileselector_go_home_cb(Ewl_Widget * w, void *ev_data,
Ewl_Fileselector * fs)
+void ewl_fileselector_go_home_cb(Ewl_Widget * w, void *ev_data, void *data)
{
+ Ewl_Fileselector *fs;
char *path;
+ fs = data;
path = ewl_fileselector_path_home_get();
ewl_fileselector_path_setup(EWL_FILESELECTOR(fs), path);
}
@@ -526,12 +532,6 @@
char *path2;
char *title;
- /*
- * FIXME: These next two lines shouldn't be necessary.
- ewl_tree_selected_clear(EWL_TREE(fs->list_dirs));
- ewl_tree_selected_clear(EWL_TREE(fs->list_files));
- */
-
ewl_container_reset(EWL_CONTAINER(fs->list_dirs));
ewl_container_reset(EWL_CONTAINER(fs->list_files));
ewl_entry_text_set(EWL_ENTRY(fs->entry_file), "");
@@ -583,8 +583,7 @@
ewl_callback_append(EWL_WIDGET(prow),
EWL_CALLBACK_CLICKED,
- EWL_CALLBACK_FUNCTION
- (ewl_fileselector_select_file_cb), fs);
+ ewl_fileselector_select_file_cb, fs);
ecore_list_next(files);
}
@@ -614,8 +613,7 @@
ecore_list_current(dirs));
ewl_callback_append(EWL_WIDGET(prow), EWL_CALLBACK_CLICKED,
- EWL_CALLBACK_FUNCTION
- (ewl_fileselector_select_dir_cb), fs);
+ ewl_fileselector_select_dir_cb, fs);
ecore_list_next(dirs);
}
@@ -695,8 +693,7 @@
/* destroy tooltip when the row is destroyed */
ewl_callback_append(EWL_WIDGET(w), EWL_CALLBACK_DESTROY,
- EWL_CALLBACK_FUNCTION
- (ewl_fileselector_tooltip_destroy_cb), tooltip);
+ ewl_fileselector_tooltip_destroy_cb, tooltip);
FREE(str);
FREE(size);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_fileselector.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- ewl_fileselector.h 9 Feb 2005 20:44:12 -0000 1.2
+++ ewl_fileselector.h 11 Feb 2005 18:10:53 -0000 1.3
@@ -62,10 +62,10 @@
* Internally used callbacks, override at your own risk.
*/
-void ewl_fileselector_select_file_cb(Ewl_Widget *w, void *ev_data,
Ewl_Fileselector *fs);
-void ewl_fileselector_select_dir_cb(Ewl_Widget *w, void *ev_data,
Ewl_Fileselector *fs);
-void ewl_fileselector_go_up_cb(Ewl_Widget *w, void *ev_data, Ewl_Fileselector
*fs);
-void ewl_fileselector_go_home_cb(Ewl_Widget *w, void *ev_data,
Ewl_Fileselector *fs);
+void ewl_fileselector_select_file_cb(Ewl_Widget *w, void *ev_data, void *data);
+void ewl_fileselector_select_dir_cb(Ewl_Widget *w, void *ev_data, void *data);
+void ewl_fileselector_go_up_cb(Ewl_Widget *w, void *ev_data, void *data);
+void ewl_fileselector_go_home_cb(Ewl_Widget *w, void *ev_data, void *data);
void ewl_fileselector_filter_cb(Ewl_Widget *entry, void *ev_data, void
*user_data);
/* Private: data for a file */
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
