Mercurial > emacs
comparison src/w32fns.c @ 92940:23d6a73f69ad
(globals_of_w32fns, Fx_create_frame): Fix last change.
author | Eli Zaretskii <eliz@gnu.org> |
---|---|
date | Fri, 14 Mar 2008 16:21:46 +0000 |
parents | c99b62a964c4 |
children | 66248fc5b523 |
comparison
equal
deleted
inserted
replaced
92939:f0b6eb7a4cc3 | 92940:23d6a73f69ad |
---|---|
332 static HWND w32_visible_system_caret_hwnd; | 332 static HWND w32_visible_system_caret_hwnd; |
333 | 333 |
334 /* From w32menu.c */ | 334 /* From w32menu.c */ |
335 extern HMENU current_popup_menu; | 335 extern HMENU current_popup_menu; |
336 static int menubar_in_use = 0; | 336 static int menubar_in_use = 0; |
337 | |
338 /* From w32uniscribe.h */ | |
339 #ifdef USE_FONT_BACKEND | |
340 extern void syms_of_w32uniscribe (); | |
341 extern int uniscribe_available; | |
342 #endif | |
343 | 337 |
344 | 338 |
345 /* Error if we are not connected to MS-Windows. */ | 339 /* Error if we are not connected to MS-Windows. */ |
346 void | 340 void |
347 check_w32 () | 341 check_w32 () |
4415 #ifdef USE_FONT_BACKEND | 4409 #ifdef USE_FONT_BACKEND |
4416 if (enable_font_backend) | 4410 if (enable_font_backend) |
4417 { | 4411 { |
4418 /* Perhaps, we must allow frame parameter, say `font-backend', | 4412 /* Perhaps, we must allow frame parameter, say `font-backend', |
4419 to specify which font backends to use. */ | 4413 to specify which font backends to use. */ |
4420 if (uniscribe_available) | |
4421 register_font_driver (&uniscribe_font_driver, f); | |
4422 register_font_driver (&w32font_driver, f); | 4414 register_font_driver (&w32font_driver, f); |
4423 | 4415 |
4424 x_default_parameter (f, parameters, Qfont_backend, Qnil, | 4416 x_default_parameter (f, parameters, Qfont_backend, Qnil, |
4425 "fontBackend", "FontBackend", RES_TYPE_STRING); | 4417 "fontBackend", "FontBackend", RES_TYPE_STRING); |
4426 } | 4418 } |
9386 doc: /* The ANSI code page used by the system. */); | 9378 doc: /* The ANSI code page used by the system. */); |
9387 w32_ansi_code_page = GetACP (); | 9379 w32_ansi_code_page = GetACP (); |
9388 | 9380 |
9389 /* MessageBox does not work without this when linked to comctl32.dll 6.0. */ | 9381 /* MessageBox does not work without this when linked to comctl32.dll 6.0. */ |
9390 InitCommonControls (); | 9382 InitCommonControls (); |
9391 #ifdef USE_FONT_BACKEND | |
9392 syms_of_w32uniscribe (); | |
9393 #endif | |
9394 } | 9383 } |
9395 | 9384 |
9396 #undef abort | 9385 #undef abort |
9397 | 9386 |
9398 void | 9387 void |