aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKarl Heuer1996-07-16 23:13:51 +0000
committerKarl Heuer1996-07-16 23:13:51 +0000
commite3881aa0c7d0fd9b18207c823f6e8389cce385e6 (patch)
tree4f1aef2e3d79a4fe7610268091a9b1ccdd254664 /src
parentd283640e036580b300c829e102c7237d844c7019 (diff)
downloademacs-e3881aa0c7d0fd9b18207c823f6e8389cce385e6.tar.gz
emacs-e3881aa0c7d0fd9b18207c823f6e8389cce385e6.zip
(Fx_create_frame): Do xlwmenu hack only if USE_LUCID.
Diffstat (limited to 'src')
-rw-r--r--src/xfns.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/xfns.c b/src/xfns.c
index e3c32396f13..74229c6d67e 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -89,8 +89,10 @@ extern void _XEditResCheckMessages ();
89 Library. */ 89 Library. */
90extern LWLIB_ID widget_id_tick; 90extern LWLIB_ID widget_id_tick;
91 91
92#ifdef USE_LUCID
92/* This is part of a kludge--see lwlib/xlwmenu.c. */ 93/* This is part of a kludge--see lwlib/xlwmenu.c. */
93extern XFontStruct *xlwmenu_default_font; 94extern XFontStruct *xlwmenu_default_font;
95#endif
94 96
95extern void free_frame_menubar (); 97extern void free_frame_menubar ();
96#endif /* USE_X_TOOLKIT */ 98#endif /* USE_X_TOOLKIT */
@@ -3147,7 +3149,7 @@ This function is an internal primitive--use `make-frame' instead.")
3147 "font", "Font", string); 3149 "font", "Font", string);
3148 } 3150 }
3149 3151
3150#ifdef USE_X_TOOLKIT 3152#ifdef USE_LUCID
3151 /* Prevent lwlib/xlwmenu.c from crashing because of a bug 3153 /* Prevent lwlib/xlwmenu.c from crashing because of a bug
3152 whereby it fails to get any font. */ 3154 whereby it fails to get any font. */
3153 xlwmenu_default_font = f->output_data.x->font; 3155 xlwmenu_default_font = f->output_data.x->font;