Enlightenment CVS committal

Author  : kwo
Project : e16
Module  : e

Dir     : e16/e/src


Modified Files:
        ewins.c ewins.h 


Log Message:
Change som macros to functions, adding check to avoid segv in certain (debug) 
situations.

===================================================================
RCS file: /cvs/e/e16/e/src/ewins.c,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -3 -r1.170 -r1.171
--- ewins.c     7 Aug 2006 20:20:15 -0000       1.170
+++ ewins.c     7 Aug 2006 20:26:05 -0000       1.171
@@ -59,6 +59,22 @@
 static void         EwinHandleEventsContainer(Win win, XEvent * ev, void *prm);
 static void         EwinHandleEventsClient(Win win, XEvent * ev, void *prm);
 
+Window
+EwinGetClientXwin(const EWin * ewin)
+{
+   Win                 win = EwinGetClientWin(ewin);
+
+   return (win) ? WinGetXwin(win) : None;
+}
+
+Window
+EwinGetContainerXwin(const EWin * ewin)
+{
+   Win                 win = EwinGetContainerWin(ewin);
+
+   return (win) ? WinGetXwin(win) : None;
+}
+
 static void
 EwinEventsConfigure(EWin * ewin, int mode)
 {
===================================================================
RCS file: /cvs/e/e16/e/src/ewins.h,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -3 -r1.54 -r1.55
--- ewins.h     7 Aug 2006 20:20:15 -0000       1.54
+++ ewins.h     7 Aug 2006 20:26:05 -0000       1.55
@@ -276,9 +276,7 @@
 #define EwinGetWindowGroup(ewin)       ((ewin)->icccm.group)
 
 #define EwinGetClientWin(ewin)         ((ewin)->client.win)
-#define EwinGetClientXwin(ewin)        Xwin((ewin)->client.win)
 #define EwinGetContainerWin(ewin)      ((ewin)->win_container)
-#define EwinGetContainerXwin(ewin)     Xwin((ewin)->win_container)
 
 /* ewins.c */
 #define EWIN_CHANGE_NAME        (1<<0)
@@ -288,6 +286,9 @@
 #define EWIN_CHANGE_LAYER       (1<<4)
 #define EWIN_CHANGE_OPACITY     (1<<5)
 #define EWIN_CHANGE_ATTENTION   (1<<6)
+
+Window              EwinGetClientXwin(const EWin * ewin);
+Window              EwinGetContainerXwin(const EWin * ewin);
 
 void                EwinShapeSet(EWin * ewin);
 void                EwinRaise(EWin * ewin);



-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to