diff options
| author | Jason Rumney | 2008-04-03 13:11:29 +0000 |
|---|---|---|
| committer | Jason Rumney | 2008-04-03 13:11:29 +0000 |
| commit | cbfedb1c5208179fa739e83ef51ba05ccd9a9928 (patch) | |
| tree | ad4604a339e641df5dc21b904f3c0014cf607866 /src | |
| parent | 56df6710a9d849eb151ae865f14586f0f5ee5cef (diff) | |
| download | emacs-cbfedb1c5208179fa739e83ef51ba05ccd9a9928.tar.gz emacs-cbfedb1c5208179fa739e83ef51ba05ccd9a9928.zip | |
(uniscribe_font_driver) [WINDOWSNT]: Declare for w32fns.c.
Diffstat (limited to 'src')
| -rw-r--r-- | src/w32fns.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/w32fns.c b/src/w32fns.c index f314b4b4f7c..a927310fffe 100644 --- a/src/w32fns.c +++ b/src/w32fns.c | |||
| @@ -341,6 +341,12 @@ static HWND w32_visible_system_caret_hwnd; | |||
| 341 | extern HMENU current_popup_menu; | 341 | extern HMENU current_popup_menu; |
| 342 | static int menubar_in_use = 0; | 342 | static int menubar_in_use = 0; |
| 343 | 343 | ||
| 344 | /* From w32uniscribe.c */ | ||
| 345 | #ifdef USE_FONT_BACKEND | ||
| 346 | extern void syms_of_w32uniscribe (); | ||
| 347 | extern int uniscribe_available; | ||
| 348 | #endif | ||
| 349 | |||
| 344 | /* Function prototypes for hourglass support. */ | 350 | /* Function prototypes for hourglass support. */ |
| 345 | static void show_hourglass P_ ((struct frame *)); | 351 | static void show_hourglass P_ ((struct frame *)); |
| 346 | static void hide_hourglass P_ ((void)); | 352 | static void hide_hourglass P_ ((void)); |
| @@ -4443,6 +4449,8 @@ This function is an internal primitive--use `make-frame' instead. */) | |||
| 4443 | { | 4449 | { |
| 4444 | /* Perhaps, we must allow frame parameter, say `font-backend', | 4450 | /* Perhaps, we must allow frame parameter, say `font-backend', |
| 4445 | to specify which font backends to use. */ | 4451 | to specify which font backends to use. */ |
| 4452 | if (uniscribe_available) | ||
| 4453 | register_font_driver (&uniscribe_font_driver, f); | ||
| 4446 | register_font_driver (&w32font_driver, f); | 4454 | register_font_driver (&w32font_driver, f); |
| 4447 | 4455 | ||
| 4448 | x_default_parameter (f, parameters, Qfont_backend, Qnil, | 4456 | x_default_parameter (f, parameters, Qfont_backend, Qnil, |
| @@ -9357,6 +9365,10 @@ globals_of_w32fns () | |||
| 9357 | 9365 | ||
| 9358 | /* MessageBox does not work without this when linked to comctl32.dll 6.0. */ | 9366 | /* MessageBox does not work without this when linked to comctl32.dll 6.0. */ |
| 9359 | InitCommonControls (); | 9367 | InitCommonControls (); |
| 9368 | |||
| 9369 | #ifdef USE_FONT_BACKEND | ||
| 9370 | syms_of_w32uniscribe (); | ||
| 9371 | #endif | ||
| 9360 | } | 9372 | } |
| 9361 | 9373 | ||
| 9362 | #undef abort | 9374 | #undef abort |