From c5353da48cb588073fc05296f0ef711200941013 Mon Sep 17 00:00:00 2001 From: kojima Date: Sun, 30 May 1999 14:19:42 +0000 Subject: [PATCH] fix compilation probs --- src/framewin.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/framewin.c b/src/framewin.c index 65655ffb..1938d88f 100644 --- a/src/framewin.c +++ b/src/framewin.c @@ -65,7 +65,7 @@ WFrameWindow* wFrameWindowCreate(WScreen *scr, int wlevel, int x, int y, int width, int height, int flags, WTexture **title_texture, WTexture **resize_texture, - unsigned long *color, GC *gc, WFont **font) + unsigned long *color, GC *gc, WMFont **font) { WFrameWindow *fwin; @@ -129,7 +129,7 @@ wFrameWindowUpdateBorders(WFrameWindow *fwin, int flags) height = fwin->core->height - fwin->top_width - fwin->bottom_width; if (flags & WFF_TITLEBAR) - theight = (*fwin->font)->height + TITLEBAR_EXTRA_HEIGHT; + theight = WMFontHeight(*fwin->font) + TITLEBAR_EXTRA_HEIGHT; else theight = 0; @@ -1080,8 +1080,9 @@ wFrameWindowPaint(WFrameWindow *fwin) XSetForeground(dpy, *fwin->title_gc, fwin->title_pixel[fwin->flags.state]); - WMDrawString(scr->wmscreen, fwin->titlebar->window, *fwin->title_gc, - *fwin->font, x, TITLEBAR_EXTRA_HEIGHT/2, title, titlelen); + WMDrawString(fwin->screen_ptr->wmscreen, fwin->titlebar->window, + *fwin->title_gc, *fwin->font, x, TITLEBAR_EXTRA_HEIGHT/2, + title, titlelen); free(title); -- 2.11.4.GIT