Enlightenment CVS committal
Author : pfritz
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_button.c ewl_combo.c ewl_filelist_column.c
ewl_filelist_icon.c ewl_filelist_list.c ewl_filelist_tree.c
ewl_filepicker.c ewl_image.c ewl_label.c ewl_list.c
ewl_model.c ewl_model.h ewl_mvc.c ewl_mvc.h ewl_tree2.c
ewl_tree2.h ewl_tree2_view_plain.c ewl_tree2_view_scrolled.c
ewl_view.h
Log Message:
use consequently "unsigned int" in all MVC related stuff
Note: that changes the API of the view callbacks and the data_fetch cb
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_button.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -3 -r1.50 -r1.51
--- ewl_button.c 29 Mar 2007 19:25:09 -0000 1.50
+++ ewl_button.c 29 Mar 2007 23:16:01 -0000 1.51
@@ -13,9 +13,10 @@
NULL
};
-static Ewl_Widget *ewl_button_view_cb_widget_fetch(void *data, int row,
- int col);
-static Ewl_Widget *ewl_button_view_cb_header_fetch(void *data, int col);
+static Ewl_Widget *ewl_button_view_cb_widget_fetch(void *data, unsigned int
row,
+ unsigned int col);
+static Ewl_Widget *ewl_button_view_cb_header_fetch(void *data,
+ unsigned int col);
/**
* @return Returns NULL on failure, a pointer to a new button on success
@@ -106,8 +107,8 @@
}
static Ewl_Widget *
-ewl_button_view_cb_widget_fetch(void *data, int row __UNUSED__,
- int col __UNUSED__)
+ewl_button_view_cb_widget_fetch(void *data, unsigned int row __UNUSED__,
+ unsigned int col __UNUSED__)
{
Ewl_Widget *button;
@@ -120,7 +121,7 @@
}
static Ewl_Widget *
-ewl_button_view_cb_header_fetch(void *data, int col __UNUSED__)
+ewl_button_view_cb_header_fetch(void *data, unsigned int col __UNUSED__)
{
Ewl_Widget *button;
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_combo.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -3 -r1.54 -r1.55
--- ewl_combo.c 29 Mar 2007 19:25:09 -0000 1.54
+++ ewl_combo.c 29 Mar 2007 23:16:01 -0000 1.55
@@ -338,7 +338,7 @@
idx->row, 0);
}
else if (view->header_fetch)
- item = view->header_fetch(ewl_mvc_data_get(mvc), -1);
+ item = view->header_fetch(ewl_mvc_data_get(mvc), 0);
if (item)
{
@@ -628,7 +628,7 @@
model = ewl_combo_cell_model_get(EWL_COMBO_CELL(w));
mvc_data = ewl_combo_cell_data_get(EWL_COMBO_CELL(w));
- ewl_mvc_selected_set(EWL_MVC(combo), model, mvc_data, i, -1);
+ ewl_mvc_selected_set(EWL_MVC(combo), model, mvc_data, i, 0);
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_filelist_column.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -3 -r1.31 -r1.32
--- ewl_filelist_column.c 29 Mar 2007 19:25:09 -0000 1.31
+++ ewl_filelist_column.c 29 Mar 2007 23:16:01 -0000 1.32
@@ -30,7 +30,8 @@
static void ewl_filelist_column_row_add(Ewl_Filelist *fl, const char *dir,
char *file, void *data);
static Ewl_Widget * ewl_filelist_column_view_cb_widget_fetch(void *data,
- int col, int row);
+ unsigned int col,
+ unsigned int row);
/**
* @return Returns the Ewl_View needed to display the filelist_column
@@ -53,7 +54,8 @@
static Ewl_Widget *
ewl_filelist_column_view_cb_widget_fetch(void *data __UNUSED__,
- int col __UNUSED__, int row __UNUSED__)
+ unsigned int col __UNUSED__,
+ unsigned int row __UNUSED__)
{
Ewl_Widget *list;
@@ -142,7 +144,7 @@
Ecore_List *path_list;
Ewl_Widget *s;
char *new_path, *p, *t, *dir, path[PATH_MAX];
- int i = 0, count = 0;
+ unsigned int i = 0, count = 0;
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("fl", fl);
@@ -184,7 +186,7 @@
ecore_list_goto_first(path_list);
while (1)
{
- int len1, len2;
+ size_t len1, len2;
d = ecore_list_next(list->dirs);
dir = ecore_list_next(path_list);
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_filelist_icon.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- ewl_filelist_icon.c 29 Mar 2007 19:25:09 -0000 1.20
+++ ewl_filelist_icon.c 29 Mar 2007 23:16:01 -0000 1.21
@@ -15,8 +15,9 @@
void *ev, void *data);
static void ewl_filelist_icon_icon_add(Ewl_Filelist *fl, const char *dir,
char *file, void *data);
-static Ewl_Widget *ewl_filelist_icon_view_cb_widget_fetch(void *data, int row,
- int col);
+static Ewl_Widget *ewl_filelist_icon_view_cb_widget_fetch(void *data,
+ unsigned int row,
+ unsigned int col);
/**
* @return Returns the Ewl_View needed to display the filelist_icon
@@ -38,7 +39,9 @@
}
static Ewl_Widget *
-ewl_filelist_icon_view_cb_widget_fetch(void *data __UNUSED__, int row
__UNUSED__, int col __UNUSED__)
+ewl_filelist_icon_view_cb_widget_fetch(void *data __UNUSED__,
+ unsigned int row __UNUSED__,
+ unsigned int col __UNUSED__)
{
Ewl_Widget *list;
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_filelist_list.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- ewl_filelist_list.c 29 Mar 2007 19:25:09 -0000 1.16
+++ ewl_filelist_list.c 29 Mar 2007 23:16:01 -0000 1.17
@@ -16,8 +16,9 @@
static void ewl_filelist_list_cb_icon_clicked(Ewl_Widget *w, void *ev,
void *data);
-static Ewl_Widget *ewl_filelist_list_view_cb_widget_fetch(void *data, int row,
- int col);
+static Ewl_Widget *ewl_filelist_list_view_cb_widget_fetch(void *data,
+ unsigned int row,
+ unsigned int col);
/**
* @return Returns the view for the filelist list
@@ -39,7 +40,9 @@
}
static Ewl_Widget *
-ewl_filelist_list_view_cb_widget_fetch(void *data __UNUSED__, int row
__UNUSED__, int col __UNUSED__)
+ewl_filelist_list_view_cb_widget_fetch(void *data __UNUSED__,
+ unsigned int row __UNUSED__,
+ unsigned int col __UNUSED__)
{
Ewl_Widget *list;
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_filelist_tree.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- ewl_filelist_tree.c 29 Mar 2007 19:25:09 -0000 1.13
+++ ewl_filelist_tree.c 29 Mar 2007 23:16:01 -0000 1.14
@@ -24,21 +24,24 @@
static Ewl_View *ewl_filelist_tree_view = NULL;
-static Ewl_Widget * ewl_filelist_tree_view_widget_fetch(void *data, int row,
- int col);
+static Ewl_Widget * ewl_filelist_tree_view_widget_fetch(void *data,
+ unsigned int row,
+ unsigned int col);
static void ewl_filelist_tree_add(Ewl_Filelist *fl, const char *dir,
char *file, void *data);
-static Ewl_Widget *ewl_filelist_tree_cb_widget_fetch(void *data, int row,
- int column);
-static Ewl_Widget *ewl_filelist_tree_cb_header_fetch(void *data, int column);
+static Ewl_Widget *ewl_filelist_tree_cb_widget_fetch(void *data,
+ unsigned int row,
+ unsigned int column);
+static Ewl_Widget *ewl_filelist_tree_cb_header_fetch(void *data,
+ unsigned int column);
/* Model callbacks */
static void * ewl_filelist_tree_data_fetch(void *data, unsigned int row,
unsigned int column);
static void ewl_filelist_tree_data_sort(void *data, unsigned int column,
Ewl_Sort_Direction sort);
-static int ewl_filelist_tree_data_count(void *data);
+static unsigned int ewl_filelist_tree_data_count(void *data);
static int ewl_filelist_tree_data_expandable_get(void *data, unsigned int row);
static void *ewl_filelist_tree_data_expansion_data_fetch(void *data,
unsigned int parent);
@@ -63,7 +66,9 @@
}
static Ewl_Widget *
-ewl_filelist_tree_view_widget_fetch(void *data __UNUSED__, int row __UNUSED__,
int col __UNUSED__)
+ewl_filelist_tree_view_widget_fetch(void *data __UNUSED__,
+ unsigned int row __UNUSED__,
+ unsigned int col __UNUSED__)
{
Ewl_Widget *tree;
@@ -284,7 +289,7 @@
/**
* @internal
*/
-static int
+static unsigned int
ewl_filelist_tree_data_count(void *data)
{
Ewl_Filelist_Tree_Data *td = data;
@@ -413,8 +418,9 @@
}
static
-Ewl_Widget *ewl_filelist_tree_cb_widget_fetch(void *data, int row __UNUSED__,
- int column __UNUSED__)
+Ewl_Widget *ewl_filelist_tree_cb_widget_fetch(void *data,
+ unsigned int row __UNUSED__,
+ unsigned int column __UNUSED__)
{
Ewl_Widget *l;
@@ -428,7 +434,8 @@
}
static
-Ewl_Widget *ewl_filelist_tree_cb_header_fetch(void *data __UNUSED__, int
column)
+Ewl_Widget *ewl_filelist_tree_cb_header_fetch(void *data __UNUSED__,
+ unsigned int column)
{
Ewl_Widget *l;
const char *t;
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_filepicker.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -3 -r1.32 -r1.33
--- ewl_filepicker.c 29 Mar 2007 19:25:09 -0000 1.32
+++ ewl_filepicker.c 29 Mar 2007 23:16:01 -0000 1.33
@@ -43,8 +43,8 @@
static void *ewl_filepicker_cb_type_fetch(void *data, unsigned int row,
unsigned int col);
-static int ewl_filepicker_cb_type_count(void *data);
-static Ewl_Widget *ewl_filepicker_cb_type_header(void *data, int col);
+static unsigned int ewl_filepicker_cb_type_count(void *data);
+static Ewl_Widget *ewl_filepicker_cb_type_header(void *data, unsigned int col);
static void ewl_filepicker_filter_free_cb(Ewl_Filepicker_Filter *filter);
@@ -668,7 +668,7 @@
DRETURN_PTR(filter->name, DLEVEL_STABLE);
}
-static int
+static unsigned int
ewl_filepicker_cb_type_count(void *data)
{
Ewl_Filepicker *fp;
@@ -682,7 +682,7 @@
}
static Ewl_Widget *
-ewl_filepicker_cb_type_header(void *data, int col)
+ewl_filepicker_cb_type_header(void *data, unsigned int col)
{
Ewl_Filepicker *fp;
Ewl_Filepicker_Filter *filter;
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_image.c,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -3 -r1.58 -r1.59
--- ewl_image.c 29 Mar 2007 19:25:09 -0000 1.58
+++ ewl_image.c 29 Mar 2007 23:16:01 -0000 1.59
@@ -20,8 +20,9 @@
static void ewl_image_rotate_180(Ewl_Image *img);
static void ewl_image_rotate_90(Ewl_Image *img, int cc);
-static Ewl_Widget *ewl_image_view_cb_header_fetch(void *data, int col);
-static Ewl_Widget *ewl_image_view_cb_widget_fetch(void *data, int row, int
col);
+static Ewl_Widget *ewl_image_view_cb_header_fetch(void *data, unsigned int
col);
+static Ewl_Widget *ewl_image_view_cb_widget_fetch(void *data, unsigned int row,
+ unsigned int col);
/**
* @return Returns a pointer to a new image widget on success, NULL on failure.
@@ -68,7 +69,8 @@
}
static Ewl_Widget *
-ewl_image_view_cb_widget_fetch(void *data, int row __UNUSED__, int col
__UNUSED__)
+ewl_image_view_cb_widget_fetch(void *data, unsigned int row __UNUSED__,
+ unsigned int col __UNUSED__)
{
Ewl_Widget *image;
@@ -81,7 +83,7 @@
}
static Ewl_Widget *
-ewl_image_view_cb_header_fetch(void *data, int col __UNUSED__)
+ewl_image_view_cb_header_fetch(void *data, unsigned int col __UNUSED__)
{
Ewl_Widget *image;
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_label.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- ewl_label.c 29 Mar 2007 19:25:09 -0000 1.25
+++ ewl_label.c 29 Mar 2007 23:16:01 -0000 1.26
@@ -5,8 +5,9 @@
#include "ewl_private.h"
#include "ewl_debug.h"
-static Ewl_Widget *ewl_label_view_cb_widget_fetch(void *data, int row, int
col);
-static Ewl_Widget *ewl_label_view_cb_header_fetch(void *data, int col);
+static Ewl_Widget *ewl_label_view_cb_widget_fetch(void *data, unsigned int row,
+ unsigned int col);
+static Ewl_Widget *ewl_label_view_cb_header_fetch(void *data, unsigned int
col);
/**
* @return Returns a new Ewl_Widget if successful, NULL on failure
@@ -111,7 +112,8 @@
}
static Ewl_Widget *
-ewl_label_view_cb_widget_fetch(void *data, int row __UNUSED__, int col
__UNUSED__)
+ewl_label_view_cb_widget_fetch(void *data, unsigned int row __UNUSED__,
+ unsigned int col __UNUSED__)
{
Ewl_Widget *label;
@@ -124,7 +126,7 @@
}
static Ewl_Widget *
-ewl_label_view_cb_header_fetch(void *data, int col __UNUSED__)
+ewl_label_view_cb_header_fetch(void *data, unsigned int col __UNUSED__)
{
Ewl_Widget *label;
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_list.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- ewl_list.c 29 Mar 2007 19:25:09 -0000 1.20
+++ ewl_list.c 29 Mar 2007 23:16:01 -0000 1.21
@@ -6,7 +6,9 @@
#include "ewl_private.h"
#include "ewl_debug.h"
-static Ewl_Widget *ewl_list_widget_at(Ewl_MVC *mvc, void *data, int row, int
column);
+static Ewl_Widget *ewl_list_widget_at(Ewl_MVC *mvc, void *data,
+ unsigned int row,
+ unsigned int column);
/**
* @return Returns a new Ewl_Widget on success or NULL on failure
@@ -148,7 +150,7 @@
void
ewl_list_cb_item_clicked(Ewl_Widget *w, void *ev __UNUSED__, void *data)
{
- int row;
+ unsigned int row;
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("w", w);
@@ -196,8 +198,8 @@
}
static Ewl_Widget *
-ewl_list_widget_at(Ewl_MVC *mvc, void *data __UNUSED__, int row,
- int column __UNUSED__)
+ewl_list_widget_at(Ewl_MVC *mvc, void *data __UNUSED__, unsigned int row,
+ unsigned int column __UNUSED__)
{
Ewl_Widget *w;
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_model.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- ewl_model.c 29 Mar 2007 19:25:09 -0000 1.18
+++ ewl_model.c 29 Mar 2007 23:16:01 -0000 1.19
@@ -376,7 +376,7 @@
* @return Returns the number of elements in the list
* @brief This will return the number of elements in the ecore_list
*/
-int
+unsigned int
ewl_model_cb_ecore_list_count(void *data)
{
Ecore_List *list;
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_model.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- ewl_model.h 25 Mar 2007 04:25:58 -0000 1.23
+++ ewl_model.h 29 Mar 2007 23:16:01 -0000 1.24
@@ -108,7 +108,7 @@
/**
* A typedef to shorten the definition of the model_count callbacks.
*/
-typedef int (*Ewl_Model_Data_Count)(void *data);
+typedef unsigned int (*Ewl_Model_Data_Count)(void *data);
/**
* @def EWL_MODEL_COLUMN_SORTABLE(f)
@@ -119,7 +119,7 @@
/**
* A typedef to shorten the definition of the model_column_sortable callbacks.
*/
-typedef int (*Ewl_Model_Column_Sortable)(void *data, int col);
+typedef int (*Ewl_Model_Column_Sortable)(void *data, unsigned int col);
/**
* @def EWL_MODEL(model)
@@ -194,7 +194,7 @@
*/
void *ewl_model_cb_ecore_list_fetch(void *data, unsigned int row,
unsigned int col);
-int ewl_model_cb_ecore_list_count(void *data);
+unsigned int ewl_model_cb_ecore_list_count(void *data);
/**
* @}
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_mvc.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- ewl_mvc.c 5 Mar 2007 11:52:54 -0000 1.20
+++ ewl_mvc.c 29 Mar 2007 23:16:01 -0000 1.21
@@ -24,7 +24,7 @@
Ewl_Selection *sel, Ewl_Widget *w);
static void ewl_mvc_selected_change_notify(Ewl_MVC *mvc);
static void ewl_mvc_selected_rm_item(Ewl_MVC *mvc, Ewl_Selection *sel,
- int row, int column);
+ unsigned int row, unsigned int column);
static void ewl_mvc_cb_sel_free(void *data);
/**
@@ -363,12 +363,12 @@
*/
void
ewl_mvc_selected_range_add(Ewl_MVC *mvc, Ewl_Model *model, void *data,
- int srow, int scolumn,
- int erow, int ecolumn)
+ unsigned int srow, unsigned int scolumn,
+ unsigned int erow, unsigned int ecolumn)
{
Ewl_Selection *sel;
Ewl_Model *mod;
- int tmp;
+ unsigned int tmp;
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("mvc", mvc);
@@ -419,7 +419,7 @@
*/
void
ewl_mvc_selected_set(Ewl_MVC *mvc, Ewl_Model *model, void *data,
- int row, int column)
+ unsigned int row, unsigned int column)
{
Ewl_Selection *sel;
@@ -450,7 +450,7 @@
*/
void
ewl_mvc_selected_add(Ewl_MVC *mvc, Ewl_Model *model, void *data,
- int row, int column)
+ unsigned int row, unsigned int column)
{
Ewl_Selection *si;
Ewl_Model *mod;
@@ -527,7 +527,8 @@
* @brief Removes the given index from the list of selected indices
*/
void
-ewl_mvc_selected_rm(Ewl_MVC *mvc, void *data __UNUSED__, int row, int column)
+ewl_mvc_selected_rm(Ewl_MVC *mvc, void *data __UNUSED__, unsigned int row,
+ unsigned int column)
{
Ewl_Selection *sel;
@@ -582,10 +583,10 @@
* @return Returns the number of items selected in the MVC
* @brief Retrives the number of items selected in the widget
*/
-int
+unsigned int
ewl_mvc_selected_count_get(Ewl_MVC *mvc)
{
- int count = 0;
+ unsigned int count = 0;
Ewl_Selection *sel;
DENTER_FUNCTION(DLEVEL_STABLE);
@@ -612,7 +613,7 @@
else if (sel->type == EWL_SELECTION_TYPE_RANGE)
{
Ewl_Selection_Range *r;
- int rows = 0, columns = 0;
+ unsigned int rows = 0, columns = 0;
r = EWL_SELECTION_RANGE(sel);
rows = (r->end.row - r->start.row) + 1;
@@ -634,10 +635,11 @@
* @brief Checks if the given index is selected or not.
*/
unsigned int
-ewl_mvc_selected_is(Ewl_MVC *mvc, void *data __UNUSED__, int row, int column)
+ewl_mvc_selected_is(Ewl_MVC *mvc, void *data __UNUSED__, unsigned int row,
+ unsigned int column)
{
Ewl_Selection *sel;
- int ret = FALSE;
+ unsigned int ret = FALSE;
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR_RET("mvc", mvc, FALSE);
@@ -688,7 +690,8 @@
* @brief Creates a new index selection based on given values
*/
Ewl_Selection *
-ewl_mvc_selection_index_new(Ewl_Model *model, void *data, int row, int column)
+ewl_mvc_selection_index_new(Ewl_Model *model, void *data, unsigned int row,
+ unsigned int column)
{
Ewl_Selection_Idx *sel;
@@ -715,9 +718,9 @@
* @brief Creates a new range selection based on given values
*/
Ewl_Selection *
-ewl_mvc_selection_range_new(Ewl_Model *model, void *data, int srow,
- int scolumn, int erow,
- int ecolumn)
+ewl_mvc_selection_range_new(Ewl_Model *model, void *data, unsigned int srow,
+ unsigned int scolumn, unsigned int erow,
+ unsigned int ecolumn)
{
Ewl_Selection_Range *sel;
@@ -746,8 +749,8 @@
* @brief Handles the click of the given cell
*/
void
-ewl_mvc_handle_click(Ewl_MVC *mvc, Ewl_Model *model, void *data, int row,
- int column)
+ewl_mvc_handle_click(Ewl_MVC *mvc, Ewl_Model *model, void *data,
+ unsigned int row, unsigned int column)
{
unsigned int modifiers;
int multi_select = FALSE;
@@ -771,7 +774,7 @@
{
Ewl_Selection *sel;
void *sdata;
- int srow, scolumn;
+ unsigned int srow, scolumn;
Ewl_Model *smod;
/* A shift will add the current position into a
@@ -795,7 +798,7 @@
else
{
Ewl_Selection_Range *idx;
- int i, k;
+ unsigned int i, k;
idx = EWL_SELECTION_RANGE(sel);
sdata = sel->data;
@@ -865,7 +868,8 @@
*/
void
ewl_mvc_highlight(Ewl_MVC *mvc, Ewl_Container *c,
- Ewl_Widget *(*widget)(Ewl_MVC *mvc, void *data, int row, int column))
+ Ewl_Widget *(*widget)(Ewl_MVC *mvc, void *data, unsigned int row,
+ unsigned int column))
{
Ewl_Selection *sel;
@@ -895,7 +899,7 @@
}
else
{
- int i, k;
+ unsigned int i, k;
Ewl_Selection_Range *idx;
idx = EWL_SELECTION_RANGE(sel);
@@ -994,7 +998,8 @@
* needed. Steps can be skipped if they would result in a zero item range.
*/
static void
-ewl_mvc_selected_rm_item(Ewl_MVC *mvc, Ewl_Selection *sel, int row, int column)
+ewl_mvc_selected_rm_item(Ewl_MVC *mvc, Ewl_Selection *sel, unsigned int row,
+ unsigned int column)
{
Ewl_Selection_Range *si;
@@ -1035,7 +1040,7 @@
if (row > si->start.row)
{
Ewl_Selection *n;
- int erow;
+ unsigned int erow;
erow = (row - 1);
@@ -1059,7 +1064,7 @@
if (column > si->start.column)
{
Ewl_Selection *n;
- int ecolumn;
+ unsigned int ecolumn;
ecolumn = (column - 1);
if ((((si->end.row - row) + 1) *
@@ -1079,7 +1084,7 @@
if (column < si->end.column)
{
Ewl_Selection *n;
- int scolumn;
+ unsigned int scolumn;
scolumn = column + 1;
if ((((si->end.row - row) + 1) *
@@ -1100,7 +1105,7 @@
if (row < si->end.row)
{
Ewl_Selection *n;
- int srow;
+ unsigned int srow;
srow = row + 1;
if ((((srow - si->end.row) + 1) *
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_mvc.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- ewl_mvc.h 4 Mar 2007 00:52:01 -0000 1.17
+++ ewl_mvc.h 29 Mar 2007 23:16:01 -0000 1.18
@@ -69,8 +69,8 @@
{
Ewl_Selection sel; /**< Inherit from Ewl_Selection */
- int row; /**< Index row */
- int column; /**< Index column */
+ unsigned int row; /**< Index row */
+ unsigned int column; /**< Index column */
};
/**
@@ -93,8 +93,8 @@
struct
{
- int row; /**< Index row */
- int column; /**< Index column */
+ unsigned int row;/**< Index row */
+ unsigned int column;/**< Index column */
} start, /**< Start of range */
end; /**< End of range */
};
@@ -158,28 +158,38 @@
void ewl_mvc_selected_range_add(Ewl_MVC *mvc, Ewl_Model * model,
void *data,
- int srow, int scolumn,
- int erow, int ecolumn);
+ unsigned int srow,
+ unsigned int scolumn,
+ unsigned int erow,
+ unsigned int ecolumn);
void ewl_mvc_selected_set(Ewl_MVC *mvc, Ewl_Model *model,
- void *data, int row, int column);
+ void *data, unsigned int row,
+ unsigned int column);
void ewl_mvc_selected_add(Ewl_MVC *mvc, Ewl_Model *model,
- void *data, int row, int column);
+ void *data, unsigned int row,
+ unsigned int column);
Ewl_Selection_Idx *ewl_mvc_selected_get(Ewl_MVC *mvc);
-void ewl_mvc_selected_rm(Ewl_MVC *mvc, void *data, int row, int
column);
+void ewl_mvc_selected_rm(Ewl_MVC *mvc, void *data, unsigned int row,
+ unsigned int column);
-int ewl_mvc_selected_count_get(Ewl_MVC *mvc);
-unsigned int ewl_mvc_selected_is(Ewl_MVC *mvc, void *data, int row, int
column);
+unsigned int ewl_mvc_selected_count_get(Ewl_MVC *mvc);
+unsigned int ewl_mvc_selected_is(Ewl_MVC *mvc, void *data, unsigned int row,
+ unsigned int column);
Ewl_Selection *ewl_mvc_selection_index_new(Ewl_Model *model, void *data,
- int row, int column);
+ unsigned int row,
+ unsigned int column);
Ewl_Selection *ewl_mvc_selection_range_new(Ewl_Model *model, void *data,
- int srow, int scolumn,
- int erow, int ecolumn);
+ unsigned int srow,
+ unsigned int scolumn,
+ unsigned int erow,
+ unsigned int ecolumn);
void ewl_mvc_highlight(Ewl_MVC *mvc, Ewl_Container *c,
Ewl_Widget *(*widget)(Ewl_MVC *mvc,
- void *data, int row, int
column));
+ void *data, unsigned int row,
+ unsigned int column));
/*
* internal
@@ -190,7 +200,8 @@
void ewl_mvc_cb_destroy(Ewl_Widget *w, void *ev, void *data);
void ewl_mvc_handle_click(Ewl_MVC *mvc, Ewl_Model *model,
- void *data, int row, int column);
+ void *data, unsigned int row,
+ unsigned int column);
/**
* @}
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_tree2.c,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -3 -r1.73 -r1.74
--- ewl_tree2.c 29 Mar 2007 19:25:09 -0000 1.73
+++ ewl_tree2.c 29 Mar 2007 23:16:01 -0000 1.74
@@ -25,7 +25,7 @@
static void ewl_tree2_cb_cell_clicked(Ewl_Widget *w, void *ev, void *data);
static void ewl_tree2_cb_selected_change(Ewl_MVC *mvc);
static Ewl_Widget *ewl_tree2_widget_at(Ewl_MVC *mvc, void *data,
- int row, int column);
+ unsigned int row, unsigned int column);
static void ewl_tree2_create_expansions_hash(Ewl_Tree2 *tree);
@@ -516,7 +516,7 @@
{
Ewl_Tree2 *tree;
Ewl_Model *model;
- int index = 0;
+ unsigned int index = 0;
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("w", w);
@@ -535,7 +535,7 @@
/* update our sort information and call the sort function, skipping
* over SORT_NONE */
- tree->sort.column = (int)data;
+ tree->sort.column = (unsigned int)data;
tree->sort.direction = ((tree->sort.direction + 1) %
EWL_SORT_DIRECTION_MAX);
if (!tree->sort.direction) tree->sort.direction ++;
@@ -548,7 +548,7 @@
static void
ewl_tree2_header_build(Ewl_Tree2 *tree, Ewl_Model *model, Ewl_View *view,
- void *mvc_data, int column)
+ void *mvc_data, unsigned int column)
{
Ewl_Widget *h, *c;
@@ -583,7 +583,8 @@
char *state_str;
ewl_callback_append(h, EWL_CALLBACK_CLICKED,
- ewl_tree2_cb_column_sort, (int
*)column);
+ ewl_tree2_cb_column_sort,
+ (unsigned int *)column);
c = ewl_button_new();
ewl_container_child_append(EWL_CONTAINER(h), c);
@@ -609,7 +610,8 @@
static void
ewl_tree2_column_build(Ewl_Row *row, Ewl_Model *model, Ewl_View *view,
- void *mvc_data, int r, int c, Ewl_Widget *node)
+ void *mvc_data, unsigned int r,
+ unsigned int c, Ewl_Widget *node)
{
Ewl_Widget *cell;
Ewl_Widget *child;
@@ -680,7 +682,7 @@
void *data, int colour, Ewl_Widget *parent,
int hidden)
{
- int i = 0, row_count = 0;
+ unsigned int i = 0, row_count = 0;
unsigned int column;
DCHECK_PARAM_PTR("tree", tree);
@@ -803,7 +805,7 @@
Ewl_Row *row;
Ewl_Tree2 *tree;
Ewl_Tree2_Node *node;
- int column;
+ unsigned int column;
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("w", w);
@@ -839,7 +841,8 @@
}
static Ewl_Widget *
-ewl_tree2_widget_at(Ewl_MVC *mvc, void *data __UNUSED__, int row, int column)
+ewl_tree2_widget_at(Ewl_MVC *mvc, void *data __UNUSED__, unsigned int row,
+ unsigned int column)
{
Ewl_Widget *r, *w;
Ewl_Tree2 *tree;
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_tree2.h,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -3 -r1.45 -r1.46
--- ewl_tree2.h 25 Mar 2007 04:25:58 -0000 1.45
+++ ewl_tree2.h 29 Mar 2007 23:16:01 -0000 1.46
@@ -100,7 +100,7 @@
Ewl_Widget *header; /**< The tree header */
Ewl_Widget *rows; /**< The rows of the tree */
- int *rowcache; /**< Cache of row sizes */
+ unsigned int *rowcache; /**< Cache of row sizes */
Ewl_Tree_Selection_Type type; /**< The selection type of the tree */
@@ -108,7 +108,7 @@
struct
{
- int column; /**< The sort column */
+ unsigned int column; /**< The sort column */
Ewl_Sort_Direction direction; /**< Sort direction */
} sort; /**< The sort information */
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_tree2_view_plain.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- ewl_tree2_view_plain.c 29 Mar 2007 19:25:09 -0000 1.6
+++ ewl_tree2_view_plain.c 29 Mar 2007 23:16:01 -0000 1.7
@@ -5,8 +5,9 @@
#include "ewl_private.h"
#include "ewl_debug.h"
-static Ewl_Widget *ewl_tree2_view_plain_cb_widget_fetch(void *data, int row,
- int col);
+static Ewl_Widget *ewl_tree2_view_plain_cb_widget_fetch(void *data,
+ unsigned int row,
+ unsigned int col);
static Ewl_View *ewl_tree2_view_plain_view = NULL;
@@ -30,8 +31,9 @@
}
static Ewl_Widget *
-ewl_tree2_view_plain_cb_widget_fetch(void *data __UNUSED__, int row __UNUSED__,
- int col __UNUSED__)
+ewl_tree2_view_plain_cb_widget_fetch(void *data __UNUSED__,
+ unsigned int row __UNUSED__,
+ unsigned int col __UNUSED__)
{
Ewl_Widget *plain;
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_tree2_view_scrolled.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- ewl_tree2_view_scrolled.c 29 Mar 2007 19:25:09 -0000 1.8
+++ ewl_tree2_view_scrolled.c 29 Mar 2007 23:16:01 -0000 1.9
@@ -8,8 +8,8 @@
static Ewl_View *ewl_tree2_view_scrolled_view = NULL;
-static Ewl_Widget * ewl_tree2_view_cb_widget_fetch(void *data, int col,
- int row);
+static Ewl_Widget * ewl_tree2_view_cb_widget_fetch(void *data, unsigned int
col,
+ unsigned int row);
/**
* @return Returns the view for this widget
@@ -31,8 +31,9 @@
}
static Ewl_Widget *
-ewl_tree2_view_cb_widget_fetch(void *data __UNUSED__, int col __UNUSED__,
- int row __UNUSED__)
+ewl_tree2_view_cb_widget_fetch(void *data __UNUSED__,
+ unsigned int col __UNUSED__,
+ unsigned int row __UNUSED__)
{
Ewl_Widget *tree;
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_view.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- ewl_view.h 27 Mar 2007 01:53:40 -0000 1.15
+++ ewl_view.h 29 Mar 2007 23:16:01 -0000 1.16
@@ -20,7 +20,8 @@
/**
* A typedef to shorten the definition of the view_widget_fetch callbacks.
*/
-typedef Ewl_Widget *(*Ewl_View_Widget_Fetch)(void *data, int row, int col);
+typedef Ewl_Widget *(*Ewl_View_Widget_Fetch)(void *data, unsigned int row,
+ unsigned int col);
/**
* @def EWL_VIEW_HEADER_GET(f)
@@ -31,7 +32,7 @@
/**
* A typedef to shorten the definition of the view_header_fetch callbacks.
*/
-typedef Ewl_Widget *(*Ewl_View_Header_Fetch)(void *data, int column);
+typedef Ewl_Widget *(*Ewl_View_Header_Fetch)(void *data, unsigned int column);
/**
* @def EWL_VIEW(view)
@@ -54,7 +55,8 @@
* A typedef to shorten the definition of the view_expansion_view_fetch
* callbacks.
*/
-typedef Ewl_View *(*Ewl_View_Expansion_View_Fetch)(void *data, int row);
+typedef Ewl_View *(*Ewl_View_Expansion_View_Fetch)(void *data,
+ unsigned int row);
/**
* @brief The view function pointers
-------------------------------------------------------------------------
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
