Enlightenment CVS committal Author : pfritz Project : e17 Module : libs/ewl
Dir : e17/libs/ewl/src/lib Modified Files: ewl_box.c ewl_button.c ewl_calendar.c ewl_cell.c ewl_check.c ewl_checkbutton.c ewl_colordialog.c ewl_colorpicker.c ewl_combo.c ewl_container.c ewl_context_menu.c ewl_datepicker.c ewl_embed.c ewl_expansion.c ewl_filedialog.c ewl_filelist.c ewl_filelist_column.c ewl_filelist_icon.c ewl_floater.c ewl_freebox.c ewl_grid.c ewl_highlight.c ewl_histogram.c ewl_icon.c ewl_image.c ewl_list.c ewl_media.c ewl_menu.c ewl_notebook.c ewl_overlay.c ewl_paned.c ewl_password.c ewl_popup.c ewl_progressbar.c ewl_radiobutton.c Log Message: check for the correct type (not only for Ewl_Widget) and some minor clean-ups =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_box.c,v retrieving revision 1.41 retrieving revision 1.42 diff -u -3 -r1.41 -r1.42 --- ewl_box.c 29 Mar 2007 19:25:09 -0000 1.41 +++ ewl_box.c 1 Apr 2007 21:48:06 -0000 1.42 @@ -380,7 +380,7 @@ DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("w", w); - DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); + DCHECK_TYPE("w", w, EWL_BOX_TYPE); b = EWL_BOX(w); @@ -466,7 +466,7 @@ DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("w", w); - DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); + DCHECK_TYPE("w", w, EWL_BOX_TYPE); if (ecore_dlist_is_empty(EWL_CONTAINER(w)->children)) DRETURN(DLEVEL_STABLE); @@ -800,7 +800,7 @@ DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("c", c); DCHECK_PARAM_PTR("w", w); - DCHECK_TYPE("c", c, EWL_CONTAINER_TYPE); + DCHECK_TYPE("c", c, EWL_BOX_TYPE); DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); if (ecore_dlist_nodes(c->children) > 1) @@ -889,7 +889,7 @@ DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("c", c); DCHECK_PARAM_PTR("w", w); - DCHECK_TYPE("c", c, EWL_CONTAINER_TYPE); + DCHECK_TYPE("c", c, EWL_BOX_TYPE); DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); if (ecore_dlist_nodes(c->children) > 1) @@ -933,7 +933,7 @@ DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("c", c); - DCHECK_TYPE("c", c, EWL_CONTAINER_TYPE); + DCHECK_TYPE("c", c, EWL_BOX_TYPE); /* * Get the appropriate dimension setting functions based on the =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_button.c,v retrieving revision 1.51 retrieving revision 1.52 diff -u -3 -r1.51 -r1.52 --- ewl_button.c 29 Mar 2007 23:16:01 -0000 1.51 +++ ewl_button.c 1 Apr 2007 21:48:06 -0000 1.52 @@ -392,6 +392,8 @@ Ewl_Event_Key *event; DENTER_FUNCTION(DLEVEL_STABLE); + DCHECK_PARAM_PTR("w", w); + DCHECK_TYPE("w", w, EWL_BUTTON_TYPE); event = ev; if ((!strcmp(event->keyname, "Return")) =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_calendar.c,v retrieving revision 1.28 retrieving revision 1.29 diff -u -3 -r1.28 -r1.29 --- ewl_calendar.c 29 Mar 2007 19:25:09 -0000 1.28 +++ ewl_calendar.c 1 Apr 2007 21:48:06 -0000 1.29 @@ -352,6 +352,7 @@ DCHECK_PARAM_PTR("w", w); DCHECK_PARAM_PTR("user_data", user_data); DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); + DCHECK_TYPE("user_data", user_data, EWL_CALENDAR_TYPE); now_tm = time(NULL); now = localtime(&now_tm); @@ -417,6 +418,7 @@ DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("user_data", user_data); + DCHECK_TYPE("user_data", user_data, EWL_CALENDAR_TYPE); ib = EWL_CALENDAR(user_data); ib->cur_month += 1; =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_cell.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -3 -r1.15 -r1.16 --- ewl_cell.c 29 Mar 2007 19:25:09 -0000 1.15 +++ ewl_cell.c 1 Apr 2007 21:48:06 -0000 1.16 @@ -78,7 +78,7 @@ DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("w", w); - DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); + DCHECK_TYPE("w", w, EWL_CELL_TYPE); c = EWL_CONTAINER(w); @@ -105,7 +105,7 @@ DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("c", c); DCHECK_PARAM_PTR("w", w); - DCHECK_TYPE("c", c, EWL_CONTAINER_TYPE); + DCHECK_TYPE("c", c, EWL_CELL_TYPE); DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); /* @@ -141,7 +141,7 @@ DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("c", c); DCHECK_PARAM_PTR("w", w); - DCHECK_TYPE("c", c, EWL_CONTAINER_TYPE); + DCHECK_TYPE("c", c, EWL_CELL_TYPE); DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); ewl_object_preferred_inner_size_set(EWL_OBJECT(c), =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_check.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -3 -r1.14 -r1.15 --- ewl_check.c 29 Mar 2007 19:25:09 -0000 1.14 +++ ewl_check.c 1 Apr 2007 21:48:06 -0000 1.15 @@ -116,7 +116,7 @@ DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("w", w); - DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); + DCHECK_TYPE("w", w, EWL_CHECK_TYPE); cb = EWL_CHECK(w); cb->checked ^= 1; @@ -142,7 +142,7 @@ DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("w", w); - DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); + DCHECK_TYPE("w", w, EWL_CHECK_TYPE); cb = EWL_CHECK(w); if (cb->checked) =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_checkbutton.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -3 -r1.16 -r1.17 --- ewl_checkbutton.c 29 Mar 2007 19:25:09 -0000 1.16 +++ ewl_checkbutton.c 1 Apr 2007 21:48:06 -0000 1.17 @@ -170,7 +170,7 @@ DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("w", w); - DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); + DCHECK_TYPE("w", w, EWL_CHECKBUTTON_TYPE); cb = EWL_CHECKBUTTON(w); =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_colordialog.c,v retrieving revision 1.29 retrieving revision 1.30 diff -u -3 -r1.29 -r1.30 --- ewl_colordialog.c 29 Mar 2007 19:25:09 -0000 1.29 +++ ewl_colordialog.c 1 Apr 2007 21:48:06 -0000 1.30 @@ -305,7 +305,9 @@ DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("w", w); - DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); + DCHECK_PARAM_PTR("data", data); + DCHECK_TYPE("w", w, EWL_STOCK_TYPE); + DCHECK_TYPE("data", data, EWL_COLORDIALOG_TYPE); type = ewl_stock_type_get(EWL_STOCK(w)); ewl_colordialog_respond(EWL_COLORDIALOG(data), type); @@ -327,7 +329,7 @@ { DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("w", w); - DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); + DCHECK_TYPE("w", w, EWL_COLORDIALOG_TYPE); ewl_colordialog_respond(EWL_COLORDIALOG(w), EWL_STOCK_CANCEL); =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_colorpicker.c,v retrieving revision 1.38 retrieving revision 1.39 diff -u -3 -r1.38 -r1.39 --- ewl_colorpicker.c 29 Mar 2007 19:25:09 -0000 1.38 +++ ewl_colorpicker.c 1 Apr 2007 21:48:06 -0000 1.39 @@ -532,7 +532,7 @@ * @brief Callback for when the square spectrum changes values */ void -ewl_colorpicker_cb_square_change(Ewl_Widget *w, void *ev __UNUSED__, +ewl_colorpicker_cb_square_change(Ewl_Widget *w __UNUSED__, void *ev __UNUSED__, void *data) { Ewl_Colorpicker *cp; @@ -540,8 +540,8 @@ double h, s, v; DENTER_FUNCTION(DLEVEL_STABLE); - DCHECK_PARAM_PTR("w", w); - DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); + DCHECK_PARAM_PTR("data", data); + DCHECK_TYPE("data", data, EWL_COLORPICKER_TYPE); cp = data; ewl_spectrum_rgb_get(EWL_SPECTRUM(cp->picker.square), &r, &g, &b); @@ -561,8 +561,8 @@ * @brief Callback for a vertical spectrum value change */ void -ewl_colorpicker_cb_vertical_change(Ewl_Widget *w, void *ev __UNUSED__, - void *data) +ewl_colorpicker_cb_vertical_change(Ewl_Widget *w __UNUSED__, + void *ev __UNUSED__, void *data) { Ewl_Colorpicker *cp; unsigned int r, g, b; @@ -572,8 +572,8 @@ unsigned int set_hsv = FALSE; DENTER_FUNCTION(DLEVEL_STABLE); - DCHECK_PARAM_PTR("w", w); - DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); + DCHECK_PARAM_PTR("data", data); + DCHECK_TYPE("data", data, EWL_COLORPICKER_TYPE); cp = data; ewl_spectrum_rgb_get(EWL_SPECTRUM(cp->picker.vertical), &r, &g, &b); @@ -643,7 +643,9 @@ DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("w", w); - DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); + DCHECK_PARAM_PTR("data", data); + DCHECK_TYPE("w", w, EWL_COLORPICKER_SPINNER_TYPE); + DCHECK_TYPE("data", data, EWL_COLORPICKER_TYPE); cp = data; ewl_spectrum_rgb_get(EWL_SPECTRUM(cp->picker.square), &r, &g, &b); @@ -717,7 +719,9 @@ DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("w", w); - DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); + DCHECK_PARAM_PTR("data", data); + DCHECK_TYPE("w", w, EWL_COLORPICKER_RADIOBUTTON_TYPE); + DCHECK_TYPE("data", data, EWL_COLORPICKER_TYPE); cp = data; cp->mode = ewl_colorpicker_radiobutton_mode_get(EWL_COLORPICKER_RADIOBUTTON(w)); @@ -743,9 +747,8 @@ Ewl_Colorpicker *cp; DENTER_FUNCTION(DLEVEL_STABLE); - DCHECK_PARAM_PTR("ev", ev); DCHECK_PARAM_PTR("data", data); - DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); + DCHECK_TYPE("data", data, EWL_COLORPICKER_TYPE); cp = data; ewl_colorpicker_current_rgb_set(cp, cp->previous.r, cp->previous.g, @@ -774,7 +777,7 @@ DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("w", w); DCHECK_PARAM_PTR("ev", ev); - DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); + DCHECK_TYPE("w", w, EWL_COLORPICKER_TYPE); printf("Data %d bytes %d bits\n", event->len, event->format); ewl_colorpicker_current_rgb_get(cp, &curcolors[0], &curcolors[1], =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_combo.c,v retrieving revision 1.56 retrieving revision 1.57 diff -u -3 -r1.56 -r1.57 --- ewl_combo.c 29 Mar 2007 23:20:19 -0000 1.56 +++ ewl_combo.c 1 Apr 2007 21:48:06 -0000 1.57 @@ -238,6 +238,7 @@ DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("data", data); + DCHECK_PARAM_PTR("data", EWL_COMBO_TYPE); combo = data; model = ewl_mvc_model_get(EWL_MVC(combo)); @@ -284,6 +285,7 @@ DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("data", data); + DCHECK_TYPE("data", data, EWL_COMBO_TYPE); combo = EWL_COMBO(data); ewl_widget_state_set(combo->button, "collapsed", EWL_STATE_PERSISTENT); @@ -301,7 +303,7 @@ DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("mvc", mvc); - DCHECK_TYPE("mvc", mvc, EWL_MVC_TYPE); + DCHECK_TYPE("mvc", mvc, EWL_COMBO_TYPE); combo = EWL_COMBO(mvc); view = ewl_mvc_view_get(mvc); @@ -621,6 +623,7 @@ DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("w", w); + DCHECK_TYPE("w", w, EWL_COMBO_CELL_TYPE); i = ewl_container_child_index_get(EWL_CONTAINER(w->parent), w); =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_container.c,v retrieving revision 1.58 retrieving revision 1.59 diff -u -3 -r1.58 -r1.59 --- ewl_container.c 29 Mar 2007 19:25:09 -0000 1.58 +++ ewl_container.c 1 Apr 2007 21:48:06 -0000 1.59 @@ -1255,7 +1255,7 @@ DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("w", w); - DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); + DCHECK_TYPE("w", w, EWL_CONTAINER_TYPE); if (!EWL_CONTAINER(w)->children) DRETURN(DLEVEL_STABLE); @@ -1287,7 +1287,7 @@ DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("w", w); - DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); + DCHECK_TYPE("w", w, EWL_CONTAINER_TYPE); if (!EWL_CONTAINER(w)->children) DRETURN(DLEVEL_STABLE); @@ -1319,7 +1319,7 @@ DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("w", w); - DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); + DCHECK_TYPE("w", w, EWL_CONTAINER_TYPE); if (!EWL_CONTAINER(w)->children) DRETURN(DLEVEL_STABLE); @@ -1351,6 +1351,8 @@ Ewl_Container *c; DENTER_FUNCTION(DLEVEL_STABLE); + DCHECK_PARAM_PTR("w", w); + DCHECK_TYPE("w", w, EWL_CONTAINER_TYPE); c = EWL_CONTAINER(w); @@ -1395,6 +1397,8 @@ Ewl_Container *c; DENTER_FUNCTION(DLEVEL_STABLE); + DCHECK_PARAM_PTR("w", w); + DCHECK_TYPE("w", w, EWL_CONTAINER_TYPE); c = EWL_CONTAINER(w); @@ -1448,7 +1452,7 @@ DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("w", w); - DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); + DCHECK_TYPE("w", w, EWL_CONTAINER_TYPE); c = EWL_CONTAINER(w); @@ -1486,7 +1490,7 @@ { DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("w", w); - DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); + DCHECK_TYPE("w", w, EWL_CONTAINER_TYPE); if (EWL_CONTAINER(w)->clip_box) { /* @@ -1519,7 +1523,7 @@ DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("w", w); - DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); + DCHECK_TYPE("w", w, EWL_CONTAINER_TYPE); c = EWL_CONTAINER(w); =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_context_menu.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -3 -r1.9 -r1.10 --- ewl_context_menu.c 29 Mar 2007 19:25:09 -0000 1.9 +++ ewl_context_menu.c 1 Apr 2007 21:48:06 -0000 1.10 @@ -269,7 +269,7 @@ { DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("w", w); - DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); + DCHECK_TYPE("w", w, EWL_CONTEXT_MENU_TYPE); if (w == ewl_embed_focused_widget_get(EWL_EMBED(w))) { Ewl_Context_Menu *cm; @@ -310,7 +310,7 @@ DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("w", w); - DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); + DCHECK_TYPE("w", w, EWL_CONTEXT_MENU_TYPE); cm = EWL_CONTEXT_MENU(w); @@ -345,7 +345,7 @@ DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("w", w); DCHECK_PARAM_PTR("ev_data", ev_data); - DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); + DCHECK_TYPE("w", w, EWL_CONTEXT_MENU_TYPE); ev = ev_data; cm = EWL_CONTEXT_MENU(w); @@ -407,7 +407,7 @@ { DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("w", w); - DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); + DCHECK_TYPE("w", w, EWL_CONTEXT_MENU_TYPE); ewl_context_menu_grabber_set(EWL_CONTEXT_MENU(w)); =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_datepicker.c,v retrieving revision 1.21 retrieving revision 1.22 diff -u -3 -r1.21 -r1.22 --- ewl_datepicker.c 29 Mar 2007 19:25:09 -0000 1.21 +++ ewl_datepicker.c 1 Apr 2007 21:48:06 -0000 1.22 @@ -101,7 +101,7 @@ DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("w", w); - DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); + DCHECK_TYPE("w", w, EWL_DATEPICKER_TYPE); dp = EWL_DATEPICKER(w); ewl_widget_destroy(dp->calendar_window); @@ -126,6 +126,7 @@ DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("user_data", user_data); + DCHECK_TYPE("user_data", user_data, EWL_DATEPICKER_TYPE); dp = EWL_DATEPICKER(user_data); ewl_widget_hide(dp->calendar_window); @@ -151,7 +152,7 @@ { DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("w", w); - DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); + DCHECK_TYPE("w", w, EWL_EMBED_TYPE); if (w == ewl_embed_focused_widget_get(EWL_EMBED(w))) ewl_widget_hide(w); @@ -167,7 +168,7 @@ DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("w", w); - DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); + DCHECK_TYPE("w", w, EWL_DATEPICKER_TYPE); dp = EWL_DATEPICKER(w); ewl_widget_show(dp->calendar_window); =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_embed.c,v retrieving revision 1.118 retrieving revision 1.119 diff -u -3 -r1.118 -r1.119 --- ewl_embed.c 29 Mar 2007 19:25:09 -0000 1.118 +++ ewl_embed.c 1 Apr 2007 21:48:06 -0000 1.119 @@ -1770,7 +1770,7 @@ DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("w", w); - DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); + DCHECK_TYPE("w", w, EWL_EMBED_TYPE); emb = EWL_EMBED(w); ewl_embed_freeze(emb); @@ -1842,7 +1842,7 @@ DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("w", w); - DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); + DCHECK_TYPE("w", w, EWL_EMBED_TYPE); emb = EWL_EMBED(w); if (emb->ev_clip) { @@ -1876,7 +1876,7 @@ DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("w", w); - DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); + DCHECK_TYPE("w", w, EWL_EMBED_TYPE); emb = EWL_EMBED(w); if (emb->ev_clip) { @@ -1924,7 +1924,7 @@ DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("w", w); - DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); + DCHECK_TYPE("w", w, EWL_EMBED_TYPE); emb = EWL_EMBED(w); if (!emb->last.focused) @@ -1952,7 +1952,7 @@ DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("w", w); - DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); + DCHECK_TYPE("w", w, EWL_EMBED_TYPE); emb = EWL_EMBED(w); if (ecore_list_goto(ewl_embed_list, w)) =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_expansion.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- ewl_expansion.c 29 Mar 2007 19:25:09 -0000 1.4 +++ ewl_expansion.c 1 Apr 2007 21:48:06 -0000 1.5 @@ -152,7 +152,7 @@ DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("w", w); - DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); + DCHECK_TYPE("w", w, EWL_EXPANSION_TYPE); cb = EWL_EXPANSION(w); if (cb->expandable) =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_filedialog.c,v retrieving revision 1.36 retrieving revision 1.37 diff -u -3 -r1.36 -r1.37 --- ewl_filedialog.c 29 Mar 2007 19:25:09 -0000 1.36 +++ ewl_filedialog.c 1 Apr 2007 21:48:06 -0000 1.37 @@ -443,7 +443,7 @@ DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("w", w); - DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); + DCHECK_TYPE("w", w, EWL_FILEDIALOG_TYPE); fd = EWL_FILEDIALOG(w); ewl_filedialog_respond(fd, EWL_STOCK_CANCEL); @@ -475,7 +475,7 @@ DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("w", w); DCHECK_PARAM_PTR("data", data); - DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); + DCHECK_TYPE("data", data, EWL_FILEDIALOG_TYPE); fd = data; e = ev; @@ -493,6 +493,7 @@ DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("data", data); + DCHECK_TYPE("data", data, EWL_FILEDIALOG_TYPE); fd = data; ewl_filedialog_list_view_set(fd, ewl_filelist_column_view_get()); @@ -508,6 +509,7 @@ DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("data", data); + DCHECK_TYPE("data", data, EWL_FILEDIALOG_TYPE); fd = data; ewl_filedialog_list_view_set(fd, ewl_filelist_icon_view_get()); @@ -523,6 +525,7 @@ DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("data", data); + DCHECK_TYPE("data", data, EWL_FILEDIALOG_TYPE); fd = data; ewl_filedialog_list_view_set(fd, ewl_filelist_list_view_get()); @@ -538,6 +541,7 @@ DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("data", data); + DCHECK_TYPE("data", data, EWL_FILEDIALOG_TYPE); fd = data; ewl_filedialog_list_view_set(fd, ewl_filelist_tree_view_get()); @@ -553,6 +557,7 @@ DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("data", data); + DCHECK_TYPE("data", data, EWL_FILEDIALOG_TYPE); fd = data; ewl_filedialog_show_dot_files_set(fd, @@ -569,6 +574,7 @@ DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("data", data); + DCHECK_TYPE("data", data, EWL_FILEDIALOG_TYPE); fd = data; ewl_filedialog_show_favorites_set(fd, =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_filelist.c,v retrieving revision 1.30 retrieving revision 1.31 diff -u -3 -r1.30 -r1.31 --- ewl_filelist.c 29 Mar 2007 19:25:09 -0000 1.30 +++ ewl_filelist.c 1 Apr 2007 21:48:06 -0000 1.31 @@ -1049,7 +1049,7 @@ DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("w", w); - DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); + DCHECK_TYPE("w", w, EWL_FILELIST_TYPE); fl = EWL_FILELIST(w); =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_filelist_column.c,v retrieving revision 1.32 retrieving revision 1.33 diff -u -3 -r1.32 -r1.33 --- ewl_filelist_column.c 29 Mar 2007 23:16:01 -0000 1.32 +++ ewl_filelist_column.c 1 Apr 2007 21:48:06 -0000 1.33 @@ -365,7 +365,8 @@ DCHECK_PARAM_PTR("w", w); DCHECK_PARAM_PTR("ev", ev); DCHECK_PARAM_PTR("data", data); - DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); + DCHECK_TYPE("w", w, EWL_ICON_TYPE); + DCHECK_TYPE("data", data, EWL_FILELIST_COLUMN_TYPE); fl = data; event = ev; @@ -419,6 +420,7 @@ DCHECK_PARAM_PTR("ev", ev); DCHECK_PARAM_PTR("data", data); DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); + DCHECK_TYPE("data", data, EWL_FILELIST_COLUMN_TYPE); fl = data; =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_filelist_icon.c,v retrieving revision 1.21 retrieving revision 1.22 diff -u -3 -r1.21 -r1.22 --- ewl_filelist_icon.c 29 Mar 2007 23:16:01 -0000 1.21 +++ ewl_filelist_icon.c 1 Apr 2007 21:48:06 -0000 1.22 @@ -224,6 +224,11 @@ Ewl_Event_Mouse_Down *event; DENTER_FUNCTION(DLEVEL_STABLE); + DCHECK_PARAM_PTR("w", w); + DCHECK_PARAM_PTR("ev", ev); + DCHECK_PARAM_PTR("data", data); + DCHECK_TYPE("w", w, EWL_ICON_TYPE); + DCHECK_TYPE("data", data, EWL_FILELIST_TYPE); icon = EWL_ICON(w); fl = data; @@ -250,6 +255,7 @@ DCHECK_PARAM_PTR("ev", ev); DCHECK_PARAM_PTR("data", data); DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); + DCHECK_TYPE("data", data, EWL_FILELIST_TYPE); ewl_filelist_handle_click(EWL_FILELIST(data), w, ev, "icon,select", "icon,unselect"); =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_floater.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -3 -r1.16 -r1.17 --- ewl_floater.c 29 Mar 2007 19:25:09 -0000 1.16 +++ ewl_floater.c 1 Apr 2007 21:48:06 -0000 1.17 @@ -196,19 +196,17 @@ * parent/window gets configured. */ void -ewl_floater_cb_follow_configure(Ewl_Widget *w, void *ev_data __UNUSED__, - void *user_data) +ewl_floater_cb_follow_configure(Ewl_Widget *w __UNUSED__, + void *ev_data __UNUSED__, void *user_data) { int align, x, y; Ewl_Floater *f; DENTER_FUNCTION(DLEVEL_STABLE); - DCHECK_PARAM_PTR("w", w); DCHECK_PARAM_PTR("user_data", user_data); - DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); + DCHECK_TYPE("user_data", user_data, EWL_FLOATER_TYPE); - w = user_data; - f = EWL_FLOATER(w); + f = EWL_FLOATER(user_data); /* * Determine actual coordinates based on absolute or relative @@ -226,30 +224,30 @@ * Store the alignment in a temporary variable for fast access to * determine positioning. */ - align = ewl_object_alignment_get(EWL_OBJECT(w)); + align = ewl_object_alignment_get(EWL_OBJECT(f)); /* * Determine the horizontal placement of the widget based on alignment */ if (align & EWL_FLAG_ALIGN_RIGHT) { - x -= CURRENT_W(w); + x -= CURRENT_W(f); } else if (!(align & EWL_FLAG_ALIGN_LEFT)) { - x -= CURRENT_W(w) / 2; + x -= CURRENT_W(f) / 2; } /* * Determine the vertical placement of the widget based on alignment */ if (align & EWL_FLAG_ALIGN_BOTTOM) { - y -= CURRENT_H(w); + y -= CURRENT_H(f); } else if (!(align & EWL_FLAG_ALIGN_TOP)) { - y -= CURRENT_H(w) / 2; + y -= CURRENT_H(f) / 2; } /* * Now request the calculated coordinates for the floater. */ - ewl_object_position_request(EWL_OBJECT(w), x, y); + ewl_object_position_request(EWL_OBJECT(f), x, y); DLEAVE_FUNCTION(DLEVEL_STABLE); } @@ -268,7 +266,7 @@ { DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("w", w); - DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); + DCHECK_TYPE("w", w, EWL_FLOATER_TYPE); EWL_FLOATER(w)->follows = NULL; =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_freebox.c,v retrieving revision 1.17 retrieving revision 1.18 diff -u -3 -r1.17 -r1.18 --- ewl_freebox.c 29 Mar 2007 19:25:09 -0000 1.17 +++ ewl_freebox.c 1 Apr 2007 21:48:06 -0000 1.18 @@ -286,15 +286,13 @@ * @brief Callback for when a child is added */ void -ewl_freebox_cb_child_add(Ewl_Container *c, Ewl_Widget *w) +ewl_freebox_cb_child_add(Ewl_Container *c, Ewl_Widget *w __UNUSED__) { Ewl_Freebox *fb; DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("c", c); - DCHECK_PARAM_PTR("w", w); - DCHECK_TYPE("c", c, EWL_CONTAINER_TYPE); - DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); + DCHECK_TYPE("c", c, EWL_FREEBOX_TYPE); /* This only does a sorted = FALSE because in the COMPARATOR layout * it will remove all of the widgets from the container and @@ -315,15 +313,13 @@ * @brief Callback for when a child is shown */ void -ewl_freebox_cb_child_show(Ewl_Container *c, Ewl_Widget *w) +ewl_freebox_cb_child_show(Ewl_Container *c, Ewl_Widget *w __UNUSED__) { Ewl_Freebox *fb; DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("c", c); - DCHECK_PARAM_PTR("w", w); - DCHECK_TYPE("c", c, EWL_CONTAINER_TYPE); - DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); + DCHECK_TYPE("c", c, EWL_FREEBOX_TYPE); fb = EWL_FREEBOX(c); fb->sorted = FALSE; =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_grid.c,v retrieving revision 1.39 retrieving revision 1.40 diff -u -3 -r1.39 -r1.40 --- ewl_grid.c 29 Mar 2007 19:25:09 -0000 1.39 +++ ewl_grid.c 1 Apr 2007 21:48:06 -0000 1.40 @@ -899,7 +899,7 @@ DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("w", w); - DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); + DCHECK_TYPE("w", w, EWL_GRID_TYPE); g = EWL_GRID(w); @@ -979,7 +979,7 @@ DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("w", w); - DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); + DCHECK_TYPE("w", w, EWL_GRID_TYPE); g = EWL_GRID(w); @@ -1500,15 +1500,13 @@ * @brief Notify the grid that a child has been added. */ void -ewl_grid_cb_child_add(Ewl_Container *p, Ewl_Widget *c) +ewl_grid_cb_child_add(Ewl_Container *p, Ewl_Widget *c __UNUSED__) { Ewl_Grid *g; DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("p", p); - DCHECK_PARAM_PTR("c", c); - DCHECK_TYPE("p", p, EWL_CONTAINER_TYPE); - DCHECK_TYPE("c", c, EWL_WIDGET_TYPE); + DCHECK_TYPE("p", p, EWL_GRID_TYPE); g = EWL_GRID(p); g->data_dirty = TRUE; @@ -1542,8 +1540,8 @@ DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("c", c); - DCHECK_TYPE("c", c, EWL_CONTAINER_TYPE); DCHECK_PARAM_PTR("w", w); + DCHECK_TYPE("c", c, EWL_GRID_TYPE); DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); g = EWL_GRID(c); @@ -1572,13 +1570,11 @@ * @brief Catch notification of child shows. */ void -ewl_grid_cb_child_show(Ewl_Container *p, Ewl_Widget *child) +ewl_grid_cb_child_show(Ewl_Container *p, Ewl_Widget *child __UNUSED__) { DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("p", p); - DCHECK_PARAM_PTR("child", child); - DCHECK_TYPE("p", p, EWL_CONTAINER_TYPE); - DCHECK_TYPE("child", child, EWL_WIDGET_TYPE); + DCHECK_TYPE("p", p, EWL_GRID_TYPE); EWL_GRID(p)->data_dirty = TRUE; ewl_grid_child_data_collect(EWL_GRID(p)); @@ -1596,15 +1592,13 @@ * @brief Catch notification of child resizes. */ void -ewl_grid_cb_child_resize(Ewl_Container *p, Ewl_Widget *child, +ewl_grid_cb_child_resize(Ewl_Container *p, Ewl_Widget *child __UNUSED__, int size __UNUSED__, Ewl_Orientation o __UNUSED__) { DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("p", p); - DCHECK_PARAM_PTR("child", child); - DCHECK_TYPE("p", p, EWL_CONTAINER_TYPE); - DCHECK_TYPE("child", child, EWL_WIDGET_TYPE); + DCHECK_TYPE("p", p, EWL_GRID_TYPE); EWL_GRID(p)->data_dirty = TRUE; ewl_widget_configure(EWL_WIDGET(p)); =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_highlight.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- ewl_highlight.c 29 Mar 2007 19:25:09 -0000 1.5 +++ ewl_highlight.c 1 Apr 2007 21:48:06 -0000 1.6 @@ -124,6 +124,7 @@ { DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("data", data); + DCHECK_TYPE("data", data, EWL_HIGHLIGHT_TYPE); ewl_floater_follow_set(EWL_FLOATER(data), NULL); ewl_widget_destroy(EWL_WIDGET(data)); =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_histogram.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -3 -r1.12 -r1.13 --- ewl_histogram.c 29 Mar 2007 19:25:09 -0000 1.12 +++ ewl_histogram.c 1 Apr 2007 21:48:06 -0000 1.13 @@ -199,7 +199,7 @@ { DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("w", w); - DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); + DCHECK_TYPE("w", w, EWL_HISTOGRAM_TYPE); /* Only bother drawing if we've seen some usable data. */ if (EWL_HISTOGRAM(w)->maxv) =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_icon.c,v retrieving revision 1.36 retrieving revision 1.37 diff -u -3 -r1.36 -r1.37 --- ewl_icon.c 29 Mar 2007 19:59:22 -0000 1.36 +++ ewl_icon.c 1 Apr 2007 21:48:06 -0000 1.37 @@ -683,7 +683,7 @@ DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("w", w); - DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); + DCHECK_TYPE("w", w, EWL_ICON_TYPE); icon = EWL_ICON(w); IF_FREE(icon->label_text); @@ -914,8 +914,8 @@ Ewl_Icon *icon; DENTER_FUNCTION(DLEVEL_STABLE); - DCHECK_PARAM_PTR("w", w); - DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); + DCHECK_PARAM_PTR("data", data); + DCHECK_TYPE("data", data, EWL_ICON_TYPE); icon = EWL_ICON(data); if (icon->alt && VISIBLE(icon->alt)) =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_image.c,v retrieving revision 1.59 retrieving revision 1.60 diff -u -3 -r1.59 -r1.60 --- ewl_image.c 29 Mar 2007 23:16:01 -0000 1.59 +++ ewl_image.c 1 Apr 2007 21:48:06 -0000 1.60 @@ -725,7 +725,7 @@ DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("w", w); - DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); + DCHECK_TYPE("w", w, EWL_IMAGE_THUMBNAIL_TYPE); thumb = EWL_IMAGE_THUMBNAIL(w); if (thumb->thumb) { @@ -787,7 +787,7 @@ DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("w", w); - DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); + DCHECK_TYPE("w", w, EWL_IMAGE_TYPE); i = EWL_IMAGE(w); emb = ewl_embed_widget_find(w); @@ -888,7 +888,7 @@ DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("w", w); - DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); + DCHECK_TYPE("w", w, EWL_IMAGE_TYPE); emb = ewl_embed_widget_find(w); @@ -918,7 +918,7 @@ DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("w", w); - DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); + DCHECK_TYPE("w", w, EWL_IMAGE_TYPE); i = EWL_IMAGE(w); @@ -944,7 +944,7 @@ DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("w", w); - DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); + DCHECK_TYPE("w", w, EWL_IMAGE_TYPE); i = EWL_IMAGE(w); if (!i->image) @@ -1078,7 +1078,7 @@ DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("w", w); - DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); + DCHECK_TYPE("w", w, EWL_IMAGE_TYPE); i = EWL_IMAGE(w); emb = ewl_embed_widget_find(w); @@ -1111,7 +1111,7 @@ DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("w", w); - DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); + DCHECK_TYPE("w", w, EWL_IMAGE_TYPE); i = EWL_IMAGE(w); emb = ewl_embed_widget_find(w); @@ -1144,7 +1144,7 @@ DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("w", w); - DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); + DCHECK_TYPE("w", w, EWL_IMAGE_TYPE); i = EWL_IMAGE(w); emb = ewl_embed_widget_find(w); =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_list.c,v retrieving revision 1.21 retrieving revision 1.22 diff -u -3 -r1.21 -r1.22 --- ewl_list.c 29 Mar 2007 23:16:01 -0000 1.21 +++ ewl_list.c 1 Apr 2007 21:48:06 -0000 1.22 @@ -81,7 +81,7 @@ DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("w", w); - DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); + DCHECK_TYPE("w", w, EWL_LIST_TYPE); list = EWL_LIST(w); @@ -126,7 +126,7 @@ DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("c", c); DCHECK_PARAM_PTR("w", w); - DCHECK_TYPE("c", c, EWL_CONTAINER_TYPE); + DCHECK_TYPE("c", c, EWL_LIST_TYPE); DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); if (ewl_mvc_selection_mode_get(EWL_MVC(c)) == @@ -190,7 +190,7 @@ { DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("mvc", mvc); - DCHECK_TYPE("mvc", mvc, EWL_MVC_TYPE); + DCHECK_TYPE("mvc", mvc, EWL_LIST_TYPE); ewl_mvc_highlight(mvc, EWL_CONTAINER(mvc), ewl_list_widget_at); =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_media.c,v retrieving revision 1.28 retrieving revision 1.29 diff -u -3 -r1.28 -r1.29 --- ewl_media.c 29 Mar 2007 19:25:09 -0000 1.28 +++ ewl_media.c 1 Apr 2007 21:48:06 -0000 1.29 @@ -481,7 +481,7 @@ DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("w", w); - DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); + DCHECK_TYPE("w", w, EWL_MEDIA_TYPE); m = EWL_MEDIA(w); @@ -524,7 +524,7 @@ DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("w", w); - DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); + DCHECK_TYPE("w", w, EWL_MEDIA_TYPE); m = EWL_MEDIA(w); @@ -555,7 +555,7 @@ DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("w", w); - DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); + DCHECK_TYPE("w", w, EWL_MEDIA_TYPE); m = EWL_MEDIA(w); @@ -581,7 +581,7 @@ DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("w", w); - DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); + DCHECK_TYPE("w", w, EWL_MEDIA_TYPE); m = EWL_MEDIA(w); @@ -626,6 +626,7 @@ DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("data", data); + DCHECK_TYPE("data", data, EWL_MEDIA_TYPE); m = data; =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_menu.c,v retrieving revision 1.48 retrieving revision 1.49 diff -u -3 -r1.48 -r1.49 --- ewl_menu.c 29 Mar 2007 19:25:09 -0000 1.48 +++ ewl_menu.c 1 Apr 2007 21:48:06 -0000 1.49 @@ -148,7 +148,7 @@ DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("w", w); - DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); + DCHECK_TYPE("w", w, EWL_MENU_TYPE); menu = EWL_MENU(w); parent = EWL_BOX(menu->menubar_parent); @@ -181,7 +181,7 @@ DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("w", w); - DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); + DCHECK_TYPE("w", w, EWL_MENU_TYPE); menu = EWL_MENU(w); if (menu->menubar_parent) { @@ -226,7 +226,7 @@ DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("w", w); - DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); + DCHECK_TYPE("w", w, EWL_MENU_TYPE); menu = EWL_MENU(w); item = EWL_MENU_ITEM(w); @@ -262,6 +262,7 @@ DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("data", data); + DCHECK_TYPE("data", data, EWL_MENU_TYPE); /* We need to set the popup to NULL here in case the popup gets * freed before the menu does. This makes sure we don't segv in the @@ -288,7 +289,7 @@ DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("w", w); - DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); + DCHECK_TYPE("w", w, EWL_MENU_TYPE); menu = EWL_MENU(w); if (menu->popup) { =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_notebook.c,v retrieving revision 1.22 retrieving revision 1.23 diff -u -3 -r1.22 -r1.23 --- ewl_notebook.c 29 Mar 2007 19:25:09 -0000 1.22 +++ ewl_notebook.c 1 Apr 2007 21:48:06 -0000 1.23 @@ -613,6 +613,7 @@ DCHECK_PARAM_PTR("w", w); DCHECK_PARAM_PTR("data", data); DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); + DCHECK_TYPE("data", data, EWL_NOTEBOOK_TYPE); n = data; page = ewl_attach_widget_association_get(w); =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_overlay.c,v retrieving revision 1.19 retrieving revision 1.20 diff -u -3 -r1.19 -r1.20 --- ewl_overlay.c 29 Mar 2007 19:25:09 -0000 1.19 +++ ewl_overlay.c 1 Apr 2007 21:48:06 -0000 1.20 @@ -83,7 +83,7 @@ DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("w", w); - DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); + DCHECK_TYPE("w", w, EWL_OVERLAY_TYPE); o = EWL_OBJECT(w); @@ -124,7 +124,7 @@ DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("o", o); DCHECK_PARAM_PTR("child", child); - DCHECK_TYPE("o", o, EWL_CONTAINER_TYPE); + DCHECK_TYPE("o", o, EWL_OVERLAY_TYPE); DCHECK_TYPE("child", child, EWL_WIDGET_TYPE); size = ewl_object_current_x_get(EWL_OBJECT(child)); @@ -161,7 +161,7 @@ DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("c", c); DCHECK_PARAM_PTR("w", w); - DCHECK_TYPE("c", c, EWL_CONTAINER_TYPE); + DCHECK_TYPE("c", c, EWL_OVERLAY_TYPE); DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); child = EWL_OBJECT(w); =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_paned.c,v retrieving revision 1.51 retrieving revision 1.52 diff -u -3 -r1.51 -r1.52 --- ewl_paned.c 29 Mar 2007 19:25:09 -0000 1.51 +++ ewl_paned.c 1 Apr 2007 21:48:06 -0000 1.52 @@ -201,7 +201,7 @@ DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("c", c); DCHECK_PARAM_PTR("w", w); - DCHECK_TYPE("c", c, EWL_CONTAINER_TYPE); + DCHECK_TYPE("c", c, EWL_PANED_TYPE); DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); /* if this is a grabber we can skipp it */ @@ -238,7 +238,7 @@ DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("c", c); DCHECK_PARAM_PTR("w", w); - DCHECK_TYPE("c", c, EWL_CONTAINER_TYPE); + DCHECK_TYPE("c", c, EWL_PANED_TYPE); DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); p = EWL_PANED(c); @@ -273,7 +273,7 @@ DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("c", c); DCHECK_PARAM_PTR("w", w); - DCHECK_TYPE("c", c, EWL_CONTAINER_TYPE); + DCHECK_TYPE("c", c, EWL_PANED_TYPE); DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); ewl_object_preferred_size_get(EWL_OBJECT(w), &ww, &wh); @@ -313,7 +313,7 @@ DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("c", c); DCHECK_PARAM_PTR("w", w); - DCHECK_TYPE("c", c, EWL_CONTAINER_TYPE); + DCHECK_TYPE("c", c, EWL_PANED_TYPE); DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); ewl_object_preferred_size_get(EWL_OBJECT(w), &ww, &wh); @@ -351,7 +351,7 @@ DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("w", w); - DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); + DCHECK_TYPE("w", w, EWL_PANED_TYPE); p = EWL_PANED(w); c = EWL_CONTAINER(p); =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_password.c,v retrieving revision 1.19 retrieving revision 1.20 diff -u -3 -r1.19 -r1.20 --- ewl_password.c 29 Mar 2007 19:25:09 -0000 1.19 +++ ewl_password.c 1 Apr 2007 21:48:06 -0000 1.20 @@ -222,7 +222,7 @@ DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("w", w); - DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); + DCHECK_TYPE("w", w, EWL_PASSWORD_TYPE); e = EWL_PASSWORD(w); ev = ev_data; @@ -270,7 +270,7 @@ DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("w", w); - DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); + DCHECK_TYPE("w", w, EWL_PASSWORD_TYPE); p = EWL_PASSWORD(w); if (p->real_text) { =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_popup.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -3 -r1.13 -r1.14 --- ewl_popup.c 29 Mar 2007 19:25:09 -0000 1.13 +++ ewl_popup.c 1 Apr 2007 21:48:06 -0000 1.14 @@ -249,7 +249,7 @@ { DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("w", w); - DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); + DCHECK_TYPE("w", w, EWL_POPUP_TYPE); ewl_popup_size_check(EWL_POPUP(w)); ewl_popup_position_check(EWL_POPUP(w)); @@ -304,7 +304,7 @@ DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("w", w); - DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); + DCHECK_TYPE("w", w, EWL_POPUP_TYPE); p = EWL_POPUP(w); if (p->follow) @@ -400,7 +400,7 @@ { DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("c", c); - DCHECK_TYPE("c", c, EWL_CONTAINER_TYPE); + DCHECK_TYPE("c", c, EWL_POPUP_TYPE); ewl_overlay_cb_child_resize(c, w, size, o); ewl_popup_position_check(EWL_POPUP(c)); =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_progressbar.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -3 -r1.16 -r1.17 --- ewl_progressbar.c 29 Mar 2007 19:25:09 -0000 1.16 +++ ewl_progressbar.c 1 Apr 2007 21:48:06 -0000 1.17 @@ -6,7 +6,7 @@ #include "ewl_private.h" #include "ewl_debug.h" -static void ewl_progressbar_child_handle(Ewl_Container *c, Ewl_Widget *w); +static void ewl_progressbar_child_handle(Ewl_Container *c); /** * @return Returns NULL on failure, or a pointer to the new progressbar on success. @@ -189,7 +189,7 @@ DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("w", w); - DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); + DCHECK_TYPE("w", w, EWL_PROGRESSBAR_TYPE); p = EWL_PROGRESSBAR(w); r = EWL_RANGE(p); @@ -229,7 +229,7 @@ DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("w", w); - DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); + DCHECK_TYPE("w", w, EWL_PROGRESSBAR_TYPE); p = EWL_PROGRESSBAR(w); r = EWL_RANGE(p); @@ -248,15 +248,14 @@ } static void -ewl_progressbar_child_handle(Ewl_Container *c, - Ewl_Widget *w __UNUSED__) +ewl_progressbar_child_handle(Ewl_Container *c) { Ewl_Range *r; double value; DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("c", c); - DCHECK_TYPE("c", c, EWL_CONTAINER_TYPE); + DCHECK_TYPE("c", c, EWL_PROGRESSBAR_TYPE); r = EWL_RANGE(c); value = r->step / (r->max_val - r->min_val); @@ -282,15 +281,13 @@ * @brief The child show callback */ void -ewl_progressbar_cb_child_show(Ewl_Container *c, Ewl_Widget *w) +ewl_progressbar_cb_child_show(Ewl_Container *c, Ewl_Widget *w __UNUSED__) { DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("c", c); - DCHECK_PARAM_PTR("w", w); - DCHECK_TYPE("c", c, EWL_CONTAINER_TYPE); - DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); + DCHECK_TYPE("c", c, EWL_PROGRESSBAR_TYPE); - ewl_progressbar_child_handle(c, w); + ewl_progressbar_child_handle(c); DLEAVE_FUNCTION(DLEVEL_STABLE); } @@ -305,17 +302,15 @@ * @brief The child resize callback */ void -ewl_progressbar_cb_child_resize(Ewl_Container *c, Ewl_Widget *w, +ewl_progressbar_cb_child_resize(Ewl_Container *c, Ewl_Widget *w __UNUSED__, int size __UNUSED__, Ewl_Orientation o __UNUSED__) { DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("c", c); - DCHECK_PARAM_PTR("w", w); - DCHECK_TYPE("c", c, EWL_CONTAINER_TYPE); - DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); + DCHECK_TYPE("c", c, EWL_PROGRESSBAR_TYPE); - ewl_progressbar_child_handle(c, w); + ewl_progressbar_child_handle(c); DLEAVE_FUNCTION(DLEVEL_STABLE); } =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_radiobutton.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -3 -r1.16 -r1.17 --- ewl_radiobutton.c 29 Mar 2007 19:25:09 -0000 1.16 +++ ewl_radiobutton.c 1 Apr 2007 21:48:06 -0000 1.17 @@ -117,7 +117,7 @@ DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("w", w); - DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); + DCHECK_TYPE("w", w, EWL_RADIOBUTTON_TYPE); cb = EWL_CHECKBUTTON(w); rb = EWL_RADIOBUTTON(w); @@ -155,7 +155,7 @@ DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("w", w); - DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); + DCHECK_TYPE("w", w, EWL_RADIOBUTTON_TYPE); rb = EWL_RADIOBUTTON(w); ------------------------------------------------------------------------- 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