Enlightenment CVS committal Author : werkt Project : misc Module : ewler
Dir : misc/ewler/src Modified Files: ewler.c form.c selected.c widgets.c Log Message: Fixed much of the select code. =================================================================== RCS file: /cvsroot/enlightenment/misc/ewler/src/ewler.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- ewler.c 9 Jun 2004 04:22:17 -0000 1.2 +++ ewler.c 6 Jul 2004 05:19:54 -0000 1.3 @@ -192,7 +192,7 @@ void tool_set_name( Ewl_Widget *w, void *ev_data, void *user_data ) { - active_tool = ewl_text_text_get( EWL_TEXT(w) ); + active_tool = ewl_button_get_label( EWL_TEXT(w) ); } void @@ -225,15 +225,17 @@ Ewl_Widget *text[] = { NULL, NULL }; if( widget_is_visible( class ) ) { - text[0] = ewl_text_new( class ); - ewl_callback_append( text[0], EWL_CALLBACK_CLICKED, - tool_set_name, NULL ); + if( widget_get_ctor( class ) ) { + text[0] = ewl_button_new( class ); + ewl_callback_append( text[0], EWL_CALLBACK_CLICKED, + tool_set_name, NULL ); + } else + text[0] = ewl_text_new( class ); + ewl_object_set_fill_policy( text[0], EWL_FLAG_FILL_NONE ); ewl_widget_show( text[0] ); row = ewl_tree_add_row( EWL_TREE(tool_tree), EWL_ROW(prow), text ); - ewl_callback_del_type( row->parent, EWL_CALLBACK_CLICKED ); - ewl_object_set_fill_policy( EWL_OBJECT(row->parent), EWL_FLAG_FILL_ALL ); - ewl_tree_set_row_expand( EWL_ROW(row), EWL_TREE_NODE_EXPANDED ); + ewl_object_set_fill_policy( EWL_OBJECT(row->parent), EWL_FLAG_FILL_FILL ); add_tools_with_parent( class, row ); ewl_widget_show( row ); =================================================================== RCS file: /cvsroot/enlightenment/misc/ewler/src/form.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- form.c 6 Jul 2004 03:38:12 -0000 1.7 +++ form.c 6 Jul 2004 05:19:54 -0000 1.8 @@ -235,14 +235,18 @@ break; case 2: break; case 3: - form->popup = ewl_imenu_new(NULL, "configure"); + form->popup = ewl_imenu_new(NULL, "Configure"); ewl_object_request_position(EWL_OBJECT(form->popup), ev->x, ev->y); ewl_object_set_fill_policy(EWL_OBJECT(form->popup), EWL_FLAG_FILL_NONE); ewl_container_append_child(EWL_CONTAINER(form->overlay), form->popup); ewl_widget_show(form->popup); ewl_callback_call(form->popup, EWL_CALLBACK_SELECT); - menu_item = ewl_menu_item_new(NULL, "conf item"); + menu_item = ewl_menu_item_new(NULL, "Lay Out Horizontally"); + ewl_container_append_child(EWL_CONTAINER(form->popup), menu_item); + ewl_widget_show(menu_item); + + menu_item = ewl_menu_item_new(NULL, "Lay Out Vertically"); ewl_container_append_child(EWL_CONTAINER(form->popup), menu_item); ewl_widget_show(menu_item); break; =================================================================== RCS file: /cvsroot/enlightenment/misc/ewler/src/selected.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- selected.c 6 Jul 2004 03:38:12 -0000 1.8 +++ selected.c 6 Jul 2004 05:19:54 -0000 1.9 @@ -71,7 +71,8 @@ ewl_object_request_geometry(EWL_OBJECT(s), CURRENT_X(w), CURRENT_Y(w), CURRENT_W(w), CURRENT_H(w)); - ewl_object_set_fill_policy(EWL_OBJECT(s), EWL_FLAG_FILL_NONE); + ewl_object_set_fill_policy(EWL_OBJECT(s), + ewl_object_get_fill_policy(EWL_OBJECT(w))); ewl_callback_append(sw, EWL_CALLBACK_CONFIGURE, ewler_selected_configure_cb, NULL); =================================================================== RCS file: /cvsroot/enlightenment/misc/ewler/src/widgets.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- widgets.c 8 Jun 2004 18:30:05 -0000 1.1 +++ widgets.c 6 Jul 2004 05:19:54 -0000 1.2 @@ -549,8 +549,8 @@ if( xml_attr ) { ctor = dlsym( dl_handle, xml_attr ); if( ctor == NULL && dlerror() ) { - fprintf( stderr, "error processing ctor: %s\n", - dlerror() ); + fprintf( stderr, "%s: error processing ctor: %s\n", + class_name, dlerror() ); exit( EXIT_FAILURE ); } } else ------------------------------------------------------- This SF.Net email sponsored by Black Hat Briefings & Training. Attend Black Hat Briefings & Training, Las Vegas July 24-29 - digital self defense, top technical experts, no vendor pitches, unmatched networking opportunities. Visit www.blackhat.com _______________________________________________ enlightenment-cvs mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs