diff options
| author | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-17 19:03:47 +0000 |
|---|---|---|
| committer | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-17 19:03:47 +0000 |
| commit | 22e912f7338ee41bd0f84f4330f4e8bc0c7501d9 (patch) | |
| tree | bd48cdf361c0881f45d09ce46c478ad8674e87c1 /src/gc.c | |
| parent | cfa9fa24253b5ef8045172852509be413d7b00ca (diff) | |
merge XFree86 4.3.0.1 to -CURRENT
Diffstat (limited to 'src/gc.c')
| -rw-r--r-- | src/gc.c | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -48,6 +48,7 @@ in this Software without prior written authorization from The Open Group. /** TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE **/ /** OR PERFORMANCE OF THIS SOFTWARE. **/ /*****************************************************************************/ +/* $XFree86: xc/programs/twm/gc.c,v 1.6 2001/12/14 20:01:07 dawes Exp $ */ /********************************************************************** @@ -64,6 +65,7 @@ in this Software without prior written authorization from The Open Group. #include "twm.h" #include "util.h" #include "screen.h" +#include "gc.h" /*********************************************************************** * @@ -99,7 +101,8 @@ CreateGCs() gcm = 0; gcm |= GCForeground; gcv.foreground = Scr->MenuC.fore; gcm |= GCBackground; gcv.background = Scr->MenuC.back; - gcm |= GCFont; gcv.font = Scr->MenuFont.font->fid; + if (!use_fontset) + {gcm |= GCFont; gcv.font = Scr->MenuFont.font->fid;} Scr->MenuGC = XCreateGC(dpy, Scr->Root, gcm, &gcv); |