mirror of
https://github.com/gryf/wmaker.git
synced 2025-12-22 05:48:01 +01:00
fix compilation probs
This commit is contained in:
@@ -65,7 +65,7 @@ WFrameWindow*
|
|||||||
wFrameWindowCreate(WScreen *scr, int wlevel, int x, int y,
|
wFrameWindowCreate(WScreen *scr, int wlevel, int x, int y,
|
||||||
int width, int height, int flags,
|
int width, int height, int flags,
|
||||||
WTexture **title_texture, WTexture **resize_texture,
|
WTexture **title_texture, WTexture **resize_texture,
|
||||||
unsigned long *color, GC *gc, WFont **font)
|
unsigned long *color, GC *gc, WMFont **font)
|
||||||
{
|
{
|
||||||
WFrameWindow *fwin;
|
WFrameWindow *fwin;
|
||||||
|
|
||||||
@@ -129,7 +129,7 @@ wFrameWindowUpdateBorders(WFrameWindow *fwin, int flags)
|
|||||||
height = fwin->core->height - fwin->top_width - fwin->bottom_width;
|
height = fwin->core->height - fwin->top_width - fwin->bottom_width;
|
||||||
|
|
||||||
if (flags & WFF_TITLEBAR)
|
if (flags & WFF_TITLEBAR)
|
||||||
theight = (*fwin->font)->height + TITLEBAR_EXTRA_HEIGHT;
|
theight = WMFontHeight(*fwin->font) + TITLEBAR_EXTRA_HEIGHT;
|
||||||
else
|
else
|
||||||
theight = 0;
|
theight = 0;
|
||||||
|
|
||||||
@@ -1080,8 +1080,9 @@ wFrameWindowPaint(WFrameWindow *fwin)
|
|||||||
XSetForeground(dpy, *fwin->title_gc,
|
XSetForeground(dpy, *fwin->title_gc,
|
||||||
fwin->title_pixel[fwin->flags.state]);
|
fwin->title_pixel[fwin->flags.state]);
|
||||||
|
|
||||||
WMDrawString(scr->wmscreen, fwin->titlebar->window, *fwin->title_gc,
|
WMDrawString(fwin->screen_ptr->wmscreen, fwin->titlebar->window,
|
||||||
*fwin->font, x, TITLEBAR_EXTRA_HEIGHT/2, title, titlelen);
|
*fwin->title_gc, *fwin->font, x, TITLEBAR_EXTRA_HEIGHT/2,
|
||||||
|
title, titlelen);
|
||||||
|
|
||||||
free(title);
|
free(title);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user