Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
eobj.c eobj.h
Log Message:
Fix build wo composite.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/eobj.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -3 -r1.57 -r1.58
--- eobj.c 31 Oct 2005 22:35:00 -0000 1.57
+++ eobj.c 6 Nov 2005 17:47:50 -0000 1.58
@@ -452,14 +452,17 @@
return pmap;
}
-#if USE_COMPOSITE
void
EobjChangeOpacity(EObj * eo, unsigned int opacity)
{
+#if USE_COMPOSITE
eo->opacity = opacity;
ECompMgrWinChangeOpacity(eo, opacity);
-}
+#else
+ eo = NULL;
+ opacity = 0;
#endif
+}
void
EobjSlideTo(EObj * eo, int fx, int fy, int tx, int ty, int speed)
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/eobj.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- eobj.h 24 Oct 2005 17:35:09 -0000 1.17
+++ eobj.h 6 Nov 2005 17:47:50 -0000 1.18
@@ -92,10 +92,10 @@
#define EoSetFloating(eo, _f) EobjSetFloating(EoObj(eo), (_f))
#define EoSetDesk(eo, _x) (eo)->o.desk = (_x)
#define EoSetLayer(eo, _l) EobjSetLayer(EoObj(eo), (_l))
+#define EoChangeOpacity(eo, _o) EobjChangeOpacity(EoObj(eo), _o)
#if USE_COMPOSITE
#define EoSetOpacity(eo, _o) (eo)->o.opacity = (_o)
#define EoGetOpacity(eo) ((eo)->o.opacity)
-#define EoChangeOpacity(eo, _o) EobjChangeOpacity(EoObj(eo), _o)
#define EoSetShadow(eo, _x) (eo)->o.shadow = (_x)
#define EoGetShadow(eo) ((eo)->o.shadow)
#define EoSetNoRedirect(eo, _x) (eo)->o.noredir = (_x)
@@ -103,7 +103,6 @@
#define EoSetFade(eo, _x) ((eo)->o.fade = (_x))
#else
#define EoSetOpacity(eo, _o)
-#define EoChangeOpacity(eo, _o)
#define EoSetShadow(eo, _x)
#define EoSetFade(eo, _x)
#endif
@@ -147,12 +146,7 @@
void EobjChangeShape(EObj * eo);
void EobjsRepaint(void);
Pixmap EobjGetPixmap(const EObj * eo);
-
-#if USE_COMPOSITE
void EobjChangeOpacity(EObj * eo, unsigned int opacity);
-#else
-#define EobjChangeOpacity(eo, opacity)
-#endif
void EobjSetLayer(EObj * eo, int layer);
void EobjSetFloating(EObj * eo, int floating);
int EobjIsShaped(const EObj * eo);
-------------------------------------------------------
SF.Net email is sponsored by:
Tame your development challenges with Apache's Geronimo App Server. Download
it for free - -and be entered to win a 42" plasma tv or your very own
Sony(tm)PSP. Click here to play: http://sourceforge.net/geronimo.php
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
