Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
E.h ecompmgr.h eobj.c
Log Message:
Fix build without composite. Cleanups.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/E.h,v
retrieving revision 1.409
retrieving revision 1.410
diff -u -3 -r1.409 -r1.410
--- E.h 20 Apr 2005 22:49:13 -0000 1.409
+++ E.h 22 Apr 2005 07:02:08 -0000 1.410
@@ -1546,6 +1546,8 @@
#if USE_COMPOSITE
Pixmap EobjGetPixmap(const EObj * eo);
void EobjChangeOpacity(EObj * eo, unsigned int opacity);
+#else
+#define EobjChangeOpacity(eo, opacity)
#endif
int EobjSetDesk(EObj * eo, int desk);
void EobjSetLayer(EObj * eo, int layer);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/ecompmgr.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- ecompmgr.h 20 Apr 2005 22:49:15 -0000 1.6
+++ ecompmgr.h 22 Apr 2005 07:02:11 -0000 1.7
@@ -46,12 +46,6 @@
void ECompMgrMoveResizeFix(EObj * eo, int x, int y, int w,
int h);
-#define ExMoveResizeWindow ECompMgrMoveResizeFix
-
-#else
-
-#define ECompMgrWinDel(eo, gone, do_fade)
-#define ExMoveResizeWindow(eo, x, y, w, h) EMoveResizeWindow((eo)->win, x, y,
w, h)
#endif
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/eobj.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- eobj.c 20 Apr 2005 22:49:15 -0000 1.19
+++ eobj.c 22 Apr 2005 07:02:11 -0000 1.20
@@ -310,15 +310,17 @@
eo->y = y;
eo->w = w;
eo->h = h;
+#if USE_COMPOSITE
if (eo->type == EOBJ_TYPE_EWIN)
{
if (EventDebug(250))
EDrawableDumpImage(eo->win, "Win1");
- ExMoveResizeWindow(eo, x, y, w, h);
+ ECompMgrMoveResizeFix(eo, x, y, w, h);
if (EventDebug(250))
EDrawableDumpImage(eo->win, "Win2");
}
else
+#endif
{
EMoveResizeWindow(eo->win, x, y, w, h);
}
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
