From 11ee1e8561fd909cb46dd31a577c9e216066c098 Mon Sep 17 00:00:00 2001
From: Kim Woelders <kim@woelders.dk>
Date: Sat, 12 Aug 2006 15:40:57 +0000
Subject: [PATCH] Wrap.

SVN revision: 24604
---
 src/coords.c   | 4 ++--
 src/ipc.c      | 4 ++--
 src/progress.c | 6 +++---
 src/tooltips.c | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/coords.c b/src/coords.c
index 2e05f955..8ce83d44 100644
--- a/src/coords.c
+++ b/src/coords.c
@@ -71,8 +71,8 @@ CoordsShow(EWin * ewin)
 
    /* Width hysteresis (hack - assuming horizontal text) */
    cw += 8;
-   if (eo && abs(eo->w - cw) < 8)
-      cw = eo->w;
+   if (eo && abs(EobjGetW(eo) - cw) < 8)
+      cw = EobjGetW(eo);
 
    if (Mode.mode == MODE_MOVE)
       md = Conf.movres.mode_move;
diff --git a/src/ipc.c b/src/ipc.c
index 6846ad71..71a1ff8b 100644
--- a/src/ipc.c
+++ b/src/ipc.c
@@ -1225,9 +1225,9 @@ IPC_ObjInfo(const char *params __UNUSED__, Client * c __UNUSED__)
 	eo = lst[i];
 	IpcPrintf
 	   (" %2d %#9lx %2d %d %d %2d  %3d %d  %d %3d %5d,%5d %4dx%4d %d %d %s\n",
-	    i, WinGetXwin(eo->win), WinGetDepth(eo->win), eo->type, eo->shown,
+	    i, EobjGetXwin(eo), WinGetDepth(eo->win), eo->type, eo->shown,
 	    eo->shaped, eo->desk->num, eo->sticky, eo->floating, eo->ilayer,
-	    eo->x, eo->y, eo->w, eo->h,
+	    EobjGetX(eo), EobjGetY(eo), EobjGetW(eo), EobjGetH(eo),
 #if USE_COMPOSITE
 	    (eo->cmhook) ? 1 : 0, !eo->noredir
 #else
diff --git a/src/progress.c b/src/progress.c
index 99b23028..ddd14d14 100644
--- a/src/progress.c
+++ b/src/progress.c
@@ -117,9 +117,9 @@ ProgressbarDestroy(Progressbar * p)
 
 	     pp = plist[j + 1];
 	     plist[j] = pp;
-	     EobjMove(pp->win, pp->win->x, pp->win->y - dy);
-	     EobjMove(pp->n_win, pp->n_win->x, pp->n_win->y - dy);
-	     EobjMove(pp->p_win, pp->p_win->x, pp->p_win->y - dy);
+	     EobjMove(pp->win, EobjGetX(pp->win), EobjGetY(pp->win) - dy);
+	     EobjMove(pp->n_win, EobjGetX(pp->n_win), EobjGetY(pp->n_win) - dy);
+	     EobjMove(pp->p_win, EobjGetX(pp->p_win), EobjGetY(pp->p_win) - dy);
 	  }
 	break;
      }
diff --git a/src/tooltips.c b/src/tooltips.c
index 52ab4269..cbc1e9a7 100644
--- a/src/tooltips.c
+++ b/src/tooltips.c
@@ -579,8 +579,8 @@ TooltipShow(ToolTip * tt, const char *text, ActionClass * ac, int x, int y)
      {
 	eo = tt->win[i];
 	if (eo)
-	   ImageclassApply(tt->iclass[i], eo->win, eo->w, eo->h, 0, 0,
-			   STATE_NORMAL, ST_TOOLTIP);
+	   ImageclassApply(tt->iclass[i], eo->win, EobjGetW(eo), EobjGetH(eo),
+			   0, 0, STATE_NORMAL, ST_TOOLTIP);
      }
 
    for (i = 0; i < 5; i++)