Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
borders.c buttons.c coords.c desktops.c dialog.c dock.c
hiwin.c iclass.c iclass.h iconify.c menus.c pager.c progress.c
startup.c tclass.c tclass.h tooltips.c warp.c
Log Message:
Eliminate unused expose parameter.
===================================================================
RCS file: /cvs/e/e16/e/src/borders.c,v
retrieving revision 1.285
retrieving revision 1.286
diff -u -3 -r1.285 -r1.286
--- borders.c 29 Mar 2006 19:13:16 -0000 1.285
+++ borders.c 16 Apr 2006 22:27:06 -0000 1.286
@@ -107,7 +107,7 @@
ewb->ts = ts;
ITApply(ewb->win, ewin->border->part[i].iclass, is, ewb->w, ewb->h,
- ewb->state, ewin->state.active, EoIsSticky(ewin), ewb->expose,
+ ewb->state, ewin->state.active, EoIsSticky(ewin),
ST_BORDER, ewin->border->part[i].tclass, ts, txt);
}
===================================================================
RCS file: /cvs/e/e16/e/src/buttons.c,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -3 -r1.85 -r1.86
--- buttons.c 6 Apr 2006 21:20:16 -0000 1.85
+++ buttons.c 16 Apr 2006 22:27:06 -0000 1.86
@@ -273,7 +273,7 @@
ButtonDraw(Button * b)
{
ITApply(EoGetWin(b), b->iclass, NULL, EoGetW(b), EoGetH(b),
- b->state, 0, 0, 0, ST_BUTTON, b->tclass, NULL, b->label);
+ b->state, 0, 0, ST_BUTTON, b->tclass, NULL, b->label);
EoShapeUpdate(b, 0);
}
===================================================================
RCS file: /cvs/e/e16/e/src/coords.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -3 -r1.42 -r1.43
--- coords.c 29 Mar 2006 19:13:16 -0000 1.42
+++ coords.c 16 Apr 2006 22:27:06 -0000 1.43
@@ -124,7 +124,7 @@
EobjMap(eo, 0);
}
- ITApply(eo->win, ic, NULL, cw, ch, STATE_NORMAL, 1, 0, 0, ST_SOLID,
+ ITApply(eo->win, ic, NULL, cw, ch, STATE_NORMAL, 1, 0, ST_SOLID,
tc, NULL, s);
EFlush();
===================================================================
RCS file: /cvs/e/e16/e/src/desktops.c,v
retrieving revision 1.234
retrieving revision 1.235
diff -u -3 -r1.234 -r1.235
--- desktops.c 16 Apr 2006 18:34:57 -0000 1.234
+++ desktops.c 16 Apr 2006 22:27:06 -0000 1.235
@@ -2274,7 +2274,7 @@
{
ic = ImageclassFind("SETTINGS_DESKTOP_AREA", 0);
if (ic)
- ImageclassApply(ic, win, w, h, 0, 0, STATE_NORMAL, 0, ST_SOLID);
+ ImageclassApply(ic, win, w, h, 0, 0, STATE_NORMAL, ST_SOLID);
for (i = 0; i < ENLIGHTENMENT_CONF_NUM_DESKTOPS; i++)
wins[i] = 0;
called = 1;
@@ -2299,7 +2299,7 @@
{
ic = ImageclassFind("SETTINGS_DESKTOP_AREA", 0);
if (ic)
- ImageclassApply(ic, wins[i], 64, 48, 0, 0, STATE_NORMAL, 0,
+ ImageclassApply(ic, wins[i], 64, 48, 0, 0, STATE_NORMAL,
ST_SOLID);
}
@@ -2527,7 +2527,7 @@
ic = ImageclassFind("SETTINGS_AREA_AREA", 0);
if (ic)
- ImageclassApply(ic, win, w, h, 0, 0, STATE_NORMAL, 0, ST_SOLID);
+ ImageclassApply(ic, win, w, h, 0, 0, STATE_NORMAL, ST_SOLID);
awin = ECreateWindow(win, 0, 0, 18, 14, 0);
ic = ImageclassFind("SETTINGS_AREADESK_AREA", 0);
if (ic)
===================================================================
RCS file: /cvs/e/e16/e/src/dialog.c,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -3 -r1.146 -r1.147
--- dialog.c 16 Apr 2006 19:56:11 -0000 1.146
+++ dialog.c 16 Apr 2006 22:27:06 -0000 1.147
@@ -464,7 +464,7 @@
int h;
ImageclassApply(db->iclass, db->win, db->w, db->h, 0, 0, state,
- 0, ST_WIDGET);
+ ST_WIDGET);
pad = ImageclassGetPadding(ic);
h = db->h - (pad->top + pad->bottom);
@@ -478,7 +478,7 @@
}
else
{
- ITApply(db->win, db->iclass, NULL, db->w, db->h, state, 0, 0, 0,
+ ITApply(db->win, db->iclass, NULL, db->w, db->h, state, 0, 0,
ST_WIDGET, db->tclass, NULL, db->text);
}
}
@@ -508,7 +508,7 @@
if (d->text)
{
TextclassApply(d->iclass, d->pmm.pmap, d->w, d->h, 0, 0, STATE_NORMAL,
- 1, d->tclass, d->text);
+ d->tclass, d->text);
}
else if (d->item)
{
@@ -1611,12 +1611,12 @@
ImageclassApply(di->item.slider.ic_base,
di->item.slider.base_win,
di->item.slider.base_w, di->item.slider.base_h,
- 0, 0, STATE_NORMAL, 0, ST_WIDGET);
+ 0, 0, STATE_NORMAL, ST_WIDGET);
if (di->item.slider.border_win)
ImageclassApply(di->item.slider.ic_border,
di->item.slider.border_win,
di->item.slider.border_w,
- di->item.slider.border_h, 0, 0, STATE_NORMAL, 0,
+ di->item.slider.border_h, 0, 0, STATE_NORMAL,
ST_WIDGET);
state = STATE_NORMAL;
if ((di->hilited) && (di->clicked))
@@ -1629,7 +1629,7 @@
ImageclassApply(di->item.slider.ic_knob,
di->item.slider.knob_win,
di->item.slider.knob_w, di->item.slider.knob_h,
- 0, 0, state, 0, ST_WIDGET);
+ 0, 0, state, ST_WIDGET);
break;
case DITEM_BUTTON:
@@ -1640,13 +1640,13 @@
state = STATE_HILITED;
else if (!(di->hilited) && (di->clicked))
state = STATE_CLICKED;
- ITApply(di->win, di->iclass, NULL, di->w, di->h, state, 0, 0, 0,
+ ITApply(di->win, di->iclass, NULL, di->w, di->h, state, 0, 0,
ST_WIDGET, di->tclass, NULL, di->text);
break;
case DITEM_AREA:
ImageclassApply(di->iclass, di->win, di->w, di->h, 0, 0,
- STATE_NORMAL, 0, ST_DIALOG);
+ STATE_NORMAL, ST_DIALOG);
break;
case DITEM_CHECKBUTTON:
@@ -1660,8 +1660,7 @@
ImageclassApply(di->iclass, di->item.check_button.check_win,
di->item.check_button.check_orig_w,
di->item.check_button.check_orig_h,
- DialogItemCheckButtonGetState(di), 0, state,
- 0, ST_WIDGET);
+ DialogItemCheckButtonGetState(di), 0, state, ST_WIDGET);
if (!d->redraw)
break;
pad = ImageclassGetPadding(di->iclass);
@@ -1681,10 +1680,10 @@
break;
if (di->item.separator.horizontal)
ImageclassApply(di->iclass, di->win, di->w, di->h, 0, 0,
- STATE_NORMAL, 0, ST_WIDGET);
+ STATE_NORMAL, ST_WIDGET);
else
ImageclassApply(di->iclass, di->win, di->w, di->h, 0, 0,
- STATE_CLICKED, 0, ST_WIDGET);
+ STATE_CLICKED, ST_WIDGET);
break;
case DITEM_RADIOBUTTON:
@@ -1698,7 +1697,7 @@
ImageclassApply(di->iclass, di->item.radio_button.radio_win,
di->item.radio_button.radio_orig_w,
di->item.radio_button.radio_orig_h,
- di->item.radio_button.onoff, 0, state, 0, ST_WIDGET);
+ di->item.radio_button.onoff, 0, state, ST_WIDGET);
if (!d->redraw)
break;
pad = ImageclassGetPadding(di->iclass);
===================================================================
RCS file: /cvs/e/e16/e/src/dock.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -3 -r1.33 -r1.34
--- dock.c 18 Feb 2006 08:30:08 -0000 1.33
+++ dock.c 16 Apr 2006 22:27:06 -0000 1.34
@@ -145,5 +145,5 @@
}
ImageclassApply(ic, EoGetWin(ewin), ewin->client.w, ewin->client.h,
- 0, 0, STATE_NORMAL, 0, ST_BUTTON);
+ 0, 0, STATE_NORMAL, ST_BUTTON);
}
===================================================================
RCS file: /cvs/e/e16/e/src/hiwin.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- hiwin.c 29 Mar 2006 19:13:16 -0000 1.9
+++ hiwin.c 16 Apr 2006 22:27:06 -0000 1.10
@@ -143,7 +143,7 @@
HiwinRenderIclassDraw(Hiwin * phi)
{
ImageclassApply(hiwin_ic, EoGetWin(phi), EoGetW(phi), EoGetH(phi), 0, 0,
- STATE_NORMAL, 0, ST_PAGER);
+ STATE_NORMAL, ST_PAGER);
EClearWindow(EoGetWin(phi));
}
===================================================================
RCS file: /cvs/e/e16/e/src/iclass.c,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -3 -r1.92 -r1.93
--- iclass.c 6 Apr 2006 21:20:16 -0000 1.92
+++ iclass.c 16 Apr 2006 22:27:06 -0000 1.93
@@ -1146,9 +1146,9 @@
}
void
-ITApply(Window win, ImageClass * ic, ImageState * is, int w, int h, int state,
- int active, int sticky, char expose, int image_type, TextClass * tc,
- TextState * ts, const char *text)
+ITApply(Window win, ImageClass * ic, ImageState * is, int w, int h,
+ int state, int active, int sticky, int image_type,
+ TextClass * tc, TextState * ts, const char *text)
{
if (win == None || !ic)
return;
@@ -1170,65 +1170,61 @@
ts = TextclassGetTextState(tc, state, active, sticky);
}
- if (!expose) /* FIXME - Hmmm */
+ if (is->im == NULL && is->im_file)
+ ImagestateRealize(is);
+
+ /* Imlib2 will not render pixmaps with dimensions > 8192 */
+ if (is->im && w <= 8192 && h <= 8192)
{
- if (is->im == NULL && is->im_file)
- ImagestateRealize(is);
+ PmapMask pmm;
- /* Imlib2 will not render pixmaps with dimensions > 8192 */
- if (is->im && w <= 8192 && h <= 8192)
- {
- PmapMask pmm;
+ ImagestateMakePmapMask(is, win, &pmm, 1, w, h, image_type);
- ImagestateMakePmapMask(is, win, &pmm, 1, w, h, image_type);
+ if (pmm.pmap)
+ {
+ Pixmap pmap = pmm.pmap;
- if (pmm.pmap)
+ if (ts && text)
{
- Pixmap pmap = pmm.pmap;
-
- if (ts && text)
- {
- if (pmm.type != 0)
- pmap = ECreatePixmapCopy(pmm.pmap, w, h, VRoot.depth);
+ if (pmm.type != 0)
+ pmap = ECreatePixmapCopy(pmm.pmap, w, h, VRoot.depth);
- TextstateDrawText(ts, pmap, text, ic->padding.left,
- ic->padding.top,
- w - (ic->padding.left +
- ic->padding.right),
- h - (ic->padding.top +
- ic->padding.bottom),
- 0, TextclassGetJustification(tc));
- }
-
- /* Set window pixmap */
- ESetWindowBackgroundPixmap(win, pmap);
- if (pmap != pmm.pmap)
- EFreePixmap(pmap);
-
- if (pmm.w == w && pmm.h == h)
- EShapeCombineMask(win, ShapeBounding, 0, 0,
- pmm.mask, ShapeSet);
- else if (pmm.mask)
- EShapeCombineMaskTiled(win, ShapeBounding, 0, 0,
- pmm.mask, ShapeSet, w, h);
+ TextstateDrawText(ts, pmap, text, ic->padding.left,
+ ic->padding.top,
+ w - (ic->padding.left +
+ ic->padding.right),
+ h - (ic->padding.top +
+ ic->padding.bottom),
+ 0, TextclassGetJustification(tc));
}
- FreePmapMask(&pmm);
- EClearWindow(win);
-
- if ((is->unloadable) || (Conf.memory_paranoia))
- {
- EImageFree(is->im);
- is->im = NULL;
- }
+ /* Set window pixmap */
+ ESetWindowBackgroundPixmap(win, pmap);
+ if (pmap != pmm.pmap)
+ EFreePixmap(pmap);
+
+ if (pmm.w == w && pmm.h == h)
+ EShapeCombineMask(win, ShapeBounding, 0, 0, pmm.mask, ShapeSet);
+ else if (pmm.mask)
+ EShapeCombineMaskTiled(win, ShapeBounding, 0, 0,
+ pmm.mask, ShapeSet, w, h);
}
- else
+
+ FreePmapMask(&pmm);
+ EClearWindow(win);
+
+ if ((is->unloadable) || (Conf.memory_paranoia))
{
- /* FIXME - No text */
- ESetWindowBackground(win, is->bg.pixel);
- EClearWindow(win);
+ EImageFree(is->im);
+ is->im = NULL;
}
}
+ else
+ {
+ /* FIXME - No text */
+ ESetWindowBackground(win, is->bg.pixel);
+ EClearWindow(win);
+ }
if (is->bevelstyle != BEVEL_NONE)
{
@@ -1242,9 +1238,9 @@
void
ImageclassApply(ImageClass * ic, Window win, int w, int h, int active,
- int sticky, int state, char expose, int image_type)
+ int sticky, int state, int image_type)
{
- ITApply(win, ic, NULL, w, h, state, active, sticky, expose, image_type,
+ ITApply(win, ic, NULL, w, h, state, active, sticky, image_type,
NULL, NULL, NULL);
}
@@ -1543,7 +1539,7 @@
if (!EDrawableCheck(win, 0)) /* Grab server? */
return;
- ImageclassApply(ic, win, w, h, 0, 0, st, 0, ST_SOLID);
+ ImageclassApply(ic, win, w, h, 0, 0, st, ST_SOLID);
}
}
else if (!strcmp(param2, "apply_copy"))
===================================================================
RCS file: /cvs/e/e16/e/src/iclass.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- iclass.h 6 Apr 2006 21:20:16 -0000 1.10
+++ iclass.h 16 Apr 2006 22:27:06 -0000 1.11
@@ -110,7 +110,7 @@
int y, int w, int h);
void ImageclassApply(ImageClass * ic, Window win, int w, int h,
int active, int sticky, int state,
- char expose, int image_type);
+ int image_type);
void ImageclassApplyCopy(ImageClass * ic, Window win, int w,
int h, int active, int sticky,
int state, PmapMask * pmm,
@@ -121,7 +121,7 @@
int image_type);
void ITApply(Window win, ImageClass * ic, ImageState * is, int
w,
int h, int state, int active, int sticky,
- char expose, int image_type, TextClass * tc,
+ int image_type, TextClass * tc,
TextState * ts, const char *text);
#endif /* _ICLASS_H */
===================================================================
RCS file: /cvs/e/e16/e/src/iconify.c,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -3 -r1.198 -r1.199
--- iconify.c 16 Apr 2006 13:27:37 -0000 1.198
+++ iconify.c 16 Apr 2006 22:27:06 -0000 1.199
@@ -1184,7 +1184,7 @@
ic = ImageclassFind("ICONBOX_SCROLLBAR_BASE_VERTICAL", 0);
if (ic)
- ImageclassApply(ic, ib->scroll_win, -1, -1, 0, 0, STATE_NORMAL, 0,
+ ImageclassApply(ic, ib->scroll_win, -1, -1, 0, 0, STATE_NORMAL,
ST_ICONBOX);
EMoveResizeWindow(ib->scrollbar_win,
@@ -1199,7 +1199,7 @@
state = STATE_HILITED;
if (ib->scrollbar_clicked)
state = STATE_CLICKED;
- ImageclassApply(ic, ib->scrollbar_win, -1, -1, 0, 0, state, 0,
+ ImageclassApply(ic, ib->scrollbar_win, -1, -1, 0, 0, state,
ST_ICONBOX);
}
@@ -1216,7 +1216,7 @@
state = STATE_HILITED;
if (ib->scrollbar_clicked)
state = STATE_CLICKED;
- ImageclassApply(ic, ib->scrollbarknob_win, -1, -1, 0, 0, state, 0,
+ ImageclassApply(ic, ib->scrollbarknob_win, -1, -1, 0, 0, state,
ST_ICONBOX);
}
else
@@ -1234,7 +1234,7 @@
state = STATE_HILITED;
if (ib->arrow1_clicked)
state = STATE_CLICKED;
- ImageclassApply(ic, ib->arrow1_win, -1, -1, 0, 0, state, 0,
+ ImageclassApply(ic, ib->arrow1_win, -1, -1, 0, 0, state,
ST_ICONBOX);
}
@@ -1246,7 +1246,7 @@
state = STATE_HILITED;
if (ib->arrow2_clicked)
state = STATE_CLICKED;
- ImageclassApply(ic, ib->arrow2_win, -1, -1, 0, 0, state, 0,
+ ImageclassApply(ic, ib->arrow2_win, -1, -1, 0, 0, state,
ST_ICONBOX);
}
}
@@ -1404,7 +1404,7 @@
ic = ImageclassFind("ICONBOX_SCROLLBAR_BASE_HORIZONTAL", 0);
if (ic)
- ImageclassApply(ic, ib->scroll_win, -1, -1, 0, 0, STATE_NORMAL, 0,
+ ImageclassApply(ic, ib->scroll_win, -1, -1, 0, 0, STATE_NORMAL,
ST_ICONBOX);
ic = ImageclassFind("ICONBOX_SCROLLBAR_KNOB_HORIZONTAL", 0);
@@ -1415,7 +1415,7 @@
state = STATE_HILITED;
if (ib->scrollbar_clicked)
state = STATE_CLICKED;
- ImageclassApply(ic, ib->scrollbar_win, -1, -1, 0, 0, state, 0,
+ ImageclassApply(ic, ib->scrollbar_win, -1, -1, 0, 0, state,
ST_ICONBOX);
}
@@ -1432,7 +1432,7 @@
state = STATE_HILITED;
if (ib->scrollbar_clicked)
state = STATE_CLICKED;
- ImageclassApply(ic, ib->scrollbarknob_win, -1, -1, 0, 0, state, 0,
+ ImageclassApply(ic, ib->scrollbarknob_win, -1, -1, 0, 0, state,
ST_ICONBOX);
}
else
@@ -1450,7 +1450,7 @@
state = STATE_HILITED;
if (ib->arrow1_clicked)
state = STATE_CLICKED;
- ImageclassApply(ic, ib->arrow1_win, -1, -1, 0, 0, state, 0,
+ ImageclassApply(ic, ib->arrow1_win, -1, -1, 0, 0, state,
ST_ICONBOX);
}
@@ -1462,7 +1462,7 @@
state = STATE_HILITED;
if (ib->arrow2_clicked)
state = STATE_CLICKED;
- ImageclassApply(ic, ib->arrow2_win, -1, -1, 0, 0, state, 0,
+ ImageclassApply(ic, ib->arrow2_win, -1, -1, 0, 0, state,
ST_ICONBOX);
}
}
@@ -1614,7 +1614,7 @@
EMoveResizeWindow(ib->cover_win, ib_xlt, ib_ylt, ib_ww, ib_hh);
EMapWindow(ib->cover_win);
ImageclassApply(ib_ic_cover, ib->cover_win, -1, -1, 0, 0, STATE_NORMAL,
- 0, ST_ICONBOX);
+ ST_ICONBOX);
}
else
{
===================================================================
RCS file: /cvs/e/e16/e/src/menus.c,v
retrieving revision 1.235
retrieving revision 1.236
diff -u -3 -r1.235 -r1.236
--- menus.c 16 Apr 2006 13:27:38 -0000 1.235
+++ menus.c 16 Apr 2006 22:27:06 -0000 1.236
@@ -816,7 +816,7 @@
EGetGeometry(m->items[i]->icon_win, NULL, NULL, NULL, &iw, &ih,
NULL, NULL);
ImageclassApply(m->items[i]->icon_iclass, m->items[i]->icon_win,
- iw, ih, 0, 0, STATE_NORMAL, 0, ST_MENU_ITEM);
+ iw, ih, 0, 0, STATE_NORMAL, ST_MENU_ITEM);
}
if (x + maxw > mmw)
mmw = x + maxw;
===================================================================
RCS file: /cvs/e/e16/e/src/pager.c,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -3 -r1.203 -r1.204
--- pager.c 16 Apr 2006 13:27:38 -0000 1.203
+++ pager.c 16 Apr 2006 22:27:06 -0000 1.204
@@ -606,7 +606,7 @@
{
DeskGetArea(p->dsk, &cx, &cy);
EMoveResizeWindow(p->sel_win, cx * p->dw, cy * p->dh, p->dw, p->dh);
- ImageclassApply(ic, p->sel_win, p->dw, p->dh, 0, 0, STATE_NORMAL, 0,
+ ImageclassApply(ic, p->sel_win, p->dw, p->dh, 0, 0, STATE_NORMAL,
ST_PAGER);
}
}
@@ -975,7 +975,7 @@
ic = ImageclassFind("PAGER_SEL", 0);
if (ic)
ImageclassApply(ic, p->sel_win, p->dw, p->dh, 0, 0,
- STATE_NORMAL, 0, ST_PAGER);
+ STATE_NORMAL, ST_PAGER);
}
}
===================================================================
RCS file: /cvs/e/e16/e/src/progress.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -3 -r1.28 -r1.29
--- progress.c 7 Jan 2006 07:20:58 -0000 1.28
+++ progress.c 16 Apr 2006 22:27:06 -0000 1.29
@@ -164,9 +164,9 @@
w = p->w;
Esnprintf(s, sizeof(s), "%i%%", p->value);
- TextclassApply(p->inc, p->n_win->win, p->h * 5, p->h, 0, 0, STATE_CLICKED,
0,
+ TextclassApply(p->inc, p->n_win->win, p->h * 5, p->h, 0, 0, STATE_CLICKED,
p->tnc, s);
- ImageclassApply(p->inc, p->p_win->win, w, p->h, 1, 0, STATE_NORMAL, 0,
+ ImageclassApply(p->inc, p->p_win->win, w, p->h, 1, 0, STATE_NORMAL,
ST_SOLID);
EobjResize(p->p_win, w, p->h);
@@ -186,10 +186,10 @@
w = p->w;
ImageclassApply(p->ic, p->win->win, p->w - (p->h * 5), p->h, 0, 0,
- STATE_NORMAL, 0, ST_SOLID);
+ STATE_NORMAL, ST_SOLID);
ImageclassApply(p->inc, p->n_win->win, (p->h * 5), p->h, 0, 0,
STATE_CLICKED,
- 0, ST_SOLID);
- ImageclassApply(p->ipc, p->p_win->win, w, p->h, 1, 0, STATE_NORMAL, 0,
+ ST_SOLID);
+ ImageclassApply(p->ipc, p->p_win->win, w, p->h, 1, 0, STATE_NORMAL,
ST_SOLID);
EobjMap(p->win, 0);
@@ -197,7 +197,7 @@
EobjMap(p->p_win, 0);
ESync();
TextclassApply(p->ic, p->win->win, p->w - (p->h * 5), p->h, 0, 0,
- STATE_NORMAL, 0, p->tc, p->win->name);
+ STATE_NORMAL, p->tc, p->win->name);
}
void
===================================================================
RCS file: /cvs/e/e16/e/src/startup.c,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -3 -r1.70 -r1.71
--- startup.c 16 Apr 2006 13:27:38 -0000 1.70
+++ startup.c 16 Apr 2006 22:27:06 -0000 1.71
@@ -100,8 +100,8 @@
EMapRaised(b1);
EMapRaised(b2);
- ImageclassApply(ic, b1, bw, bh, 0, 0, 0, 0, ST_SOLID);
- ImageclassApply(ic, b2, bw, bh, 0, 0, 0, 0, ST_SOLID);
+ ImageclassApply(ic, b1, bw, bh, 0, 0, 0, ST_SOLID);
+ ImageclassApply(ic, b2, bw, bh, 0, 0, 0, ST_SOLID);
}
BackgroundSet(bg, win1, VRoot.w, VRoot.h);
===================================================================
RCS file: /cvs/e/e16/e/src/tclass.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -3 -r1.41 -r1.42
--- tclass.c 29 Mar 2006 19:13:17 -0000 1.41
+++ tclass.c 16 Apr 2006 22:27:06 -0000 1.42
@@ -471,8 +471,8 @@
}
void
-TextclassApply(ImageClass * iclass, Window win, int w, int h, int active,
- int sticky, int state, char expose __UNUSED__,
+TextclassApply(ImageClass * iclass, Window win, int w, int h,
+ int active, int sticky, int state,
TextClass * tclass, const char *text)
{
EImageBorder *pad;
===================================================================
RCS file: /cvs/e/e16/e/src/tclass.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- tclass.h 6 Apr 2006 21:20:16 -0000 1.5
+++ tclass.h 16 Apr 2006 22:27:06 -0000 1.6
@@ -80,8 +80,7 @@
TextClass *TextclassFind(const char *name, int fallback);
void TextclassApply(ImageClass * ic, Window win, int w,
int h, int active, int sticky, int state,
- char expose, TextClass * tclass,
- const char *text);
+ TextClass * tclass, const char *text);
/* text.c */
TextState *TextclassGetTextState(TextClass * tclass, int state,
===================================================================
RCS file: /cvs/e/e16/e/src/tooltips.c,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -3 -r1.97 -r1.98
--- tooltips.c 16 Apr 2006 13:27:38 -0000 1.97
+++ tooltips.c 16 Apr 2006 22:27:06 -0000 1.98
@@ -446,7 +446,7 @@
iy = (h - ih) / 2;
EMoveResizeWindow(tt->iwin, ix, iy, iw, ih);
EMapWindow(tt->iwin);
- ImageclassApply(tt->tooltippic, tt->iwin, iw, ih, 0, 0, STATE_NORMAL, 0,
+ ImageclassApply(tt->tooltippic, tt->iwin, iw, ih, 0, 0, STATE_NORMAL,
ST_SOLID);
}
else
@@ -580,7 +580,7 @@
eo = tt->win[i];
if (eo)
ImageclassApply(tt->iclass[i], eo->win, eo->w, eo->h, 0, 0,
- STATE_NORMAL, 0, ST_TOOLTIP);
+ STATE_NORMAL, ST_TOOLTIP);
}
for (i = 0; i < 5; i++)
===================================================================
RCS file: /cvs/e/e16/e/src/warp.c,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -3 -r1.86 -r1.87
--- warp.c 29 Mar 2006 19:13:17 -0000 1.86
+++ warp.c 16 Apr 2006 22:27:06 -0000 1.87
@@ -205,7 +205,7 @@
state = (i == warpFocusIndex) ? STATE_CLICKED : STATE_NORMAL;
- ImageclassApply(fw->ic, wi->win, fw->mw, fw->mh, 0, 0, state, 0,
+ ImageclassApply(fw->ic, wi->win, fw->mw, fw->mh, 0, 0, state,
ST_WARPLIST);
/* New icon stuff */
@@ -232,7 +232,7 @@
}
else
{
- TextclassApply(fw->ic, wi->win, fw->mw, fw->mh, 0, 0, state, 0,
+ TextclassApply(fw->ic, wi->win, fw->mw, fw->mh, 0, 0, state,
fw->tc, wi->txt);
}
}
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
