diff options
| author | YAMAMOTO Mitsuharu | 2010-04-16 10:08:29 +0900 |
|---|---|---|
| committer | YAMAMOTO Mitsuharu | 2010-04-16 10:08:29 +0900 |
| commit | b117f7cc49000f4c2b046c9dfcae172ddc22dd0c (patch) | |
| tree | 2c03020e086e8a8f84b1876f68557c28da77b048 | |
| parent | 20af301df3b38ffc6ba2c6c98079c91e983d26cf (diff) | |
| download | emacs-b117f7cc49000f4c2b046c9dfcae172ddc22dd0c.tar.gz emacs-b117f7cc49000f4c2b046c9dfcae172ddc22dd0c.zip | |
xlwmenu.c (facename_changed): Put function in #ifdef HAVE_XFT.
| -rw-r--r-- | lwlib/ChangeLog | 4 | ||||
| -rw-r--r-- | lwlib/xlwmenu.c | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/lwlib/ChangeLog b/lwlib/ChangeLog index a0a08827e9c..e7037a2d952 100644 --- a/lwlib/ChangeLog +++ b/lwlib/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2010-04-16 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | ||
| 2 | |||
| 3 | * xlwmenu.c (facename_changed): Put function in #ifdef HAVE_XFT. | ||
| 4 | |||
| 1 | 2010-04-11 Dan Nicolaescu <dann@ics.uci.edu> | 5 | 2010-04-11 Dan Nicolaescu <dann@ics.uci.edu> |
| 2 | 6 | ||
| 3 | * Makefile.in (C_SWITCH_SYSTEM, C_SWITCH_MACHINE) | 7 | * Makefile.in (C_SWITCH_SYSTEM, C_SWITCH_MACHINE) |
diff --git a/lwlib/xlwmenu.c b/lwlib/xlwmenu.c index 3e8259f9a19..389cf8daaaf 100644 --- a/lwlib/xlwmenu.c +++ b/lwlib/xlwmenu.c | |||
| @@ -2135,6 +2135,7 @@ XlwMenuDestroy (w) | |||
| 2135 | XtFree ((char *) mw->menu.windows); | 2135 | XtFree ((char *) mw->menu.windows); |
| 2136 | } | 2136 | } |
| 2137 | 2137 | ||
| 2138 | #ifdef HAVE_XFT | ||
| 2138 | static int | 2139 | static int |
| 2139 | facename_changed (XlwMenuWidget newmw, | 2140 | facename_changed (XlwMenuWidget newmw, |
| 2140 | XlwMenuWidget oldmw) | 2141 | XlwMenuWidget oldmw) |
| @@ -2144,6 +2145,7 @@ facename_changed (XlwMenuWidget newmw, | |||
| 2144 | we just want to do a redisplay. */ | 2145 | we just want to do a redisplay. */ |
| 2145 | return newmw->menu.faceName != oldmw->menu.faceName; | 2146 | return newmw->menu.faceName != oldmw->menu.faceName; |
| 2146 | } | 2147 | } |
| 2148 | #endif | ||
| 2147 | 2149 | ||
| 2148 | static Boolean | 2150 | static Boolean |
| 2149 | XlwMenuSetValues (current, request, new) | 2151 | XlwMenuSetValues (current, request, new) |