1
0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-21 21:38:00 +01:00

fix compilation probs

This commit is contained in:
kojima
1999-05-30 14:19:42 +00:00
parent f9a04a642f
commit c5353da48c

View File

@@ -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);