comparison src/console-msw.c @ 2367:ecf1ebac70d8

[xemacs-hg @ 2004-11-04 23:05:23 by ben] commit mega-patch configure.in: Turn off -Winline and -Wchar-subscripts. Use the right set of cflags when compiling modules. Rewrite ldap configuration to separate the inclusion of lber (needed in recent Cygwin) from the basic checks for the needed libraries. add a function for MAKE_JUNK_C; initially code was added to generate xemacs.def using this, but it will need to be rewritten. add an rm -f for junk.c to avoid weird Cygwin bug with cp -f onto an existing file. Sort list of auto-detected functions and eliminate unused checks for stpcpy, setlocale and getwd. Add autodetection of Cygwin scanf problems BETA: Rewrite section on configure to indicate what flags are important and what not. digest-doc.c, make-dump-id.c, profile.c, sorted-doc.c: Add proper decls for main(). make-msgfile.c: Document that this is old junk. Move proposal to text.c. make-msgfile.lex: Move proposal to text.c. make-mswin-unicode.pl: Convert error-generating code so that the entire message will be seen as a single unrecognized token. mule/mule-ccl.el: Update docs. lispref/mule.texi: Update CCL docs. ldap/eldap.c: Mule-ize. Use EXTERNAL_LIST_LOOP_2 instead of deleted EXTERNAL_LIST_LOOP. * XEmacs 21.5.18 "chestnut" is released. --------------------------------------------------------------- MULE-RELATED WORK: --------------------------------------------------------------- --------------------------- byte-char conversion --------------------------- buffer.c, buffer.h, insdel.c, text.c: Port FSF algorithm for byte-char conversion, replacing broken previous version. Track the char position of the gap. Add functions to do char-byte conversion downwards as well as upwards. Move comments about algorithm workings to internals manual. --------------------------- work on types --------------------------- alloc.c, console-x-impl.h, dump-data.c, dump-data.h, dumper.c, dialog-msw.c, dired-msw.c, doc.c, editfns.c, esd.c, event-gtk.h, event-msw.c, events.c, file-coding.c, file-coding.h, fns.c, glyphs-eimage.c, glyphs-gtk.c, glyphs-msw.c, glyphs-shared.c, glyphs-x.c, glyphs.c, glyphs.h, gui.c, hpplay.c, imgproc.c, intl-win32.c, lrecord.h, lstream.c, keymap.c, lisp.h, libsst.c, linuxplay.c, miscplay.c, miscplay.h, mule-coding.c, nas.c, nt.c, ntheap.c, ntplay.c, objects-msw.c, objects-tty.c, objects-x.c, print.c, process-nt.c, process.c, redisplay.h, select-common.h, select-gtk.c, select-x.c, sgiplay.c, sound.c, sound.h, sunplay.c, sysfile.h, sysdep.c, syswindows.h, text.c, unexnt.c, win32.c, xgccache.c: Further work on types. This creates a full set of types for all the basic semantics of `char' that I have so far identified, so that its semantics can always be identified for the purposes of proper Mule-safe code, and the raw use of `char' always avoided. (1) More type renaming, for consistency of naming. Char_ASCII -> Ascbyte UChar_ASCII -> UAscbyte Char_Binary -> CBinbyte UChar_Binary -> Binbyte SChar_Binary -> SBinbyte (2) Introduce Rawbyte, CRawbyte, Boolbyte, Chbyte, UChbyte, and Bitbyte and use them. (3) New types Itext, Wexttext and Textcount for separating out the concepts of bytes and textual units (different under UTF-16 and UTF-32, which are potential internal encodings). (4) qxestr*_c -> qxestr*_ascii. lisp.h: New; goes with other qxe() functions. #### Maybe goes in a different section. lisp.h: Group generic int-type defs together with EMACS_INT defs. lisp.h: * lisp.h (WEXTTEXT_IS_WIDE) New defns. lisp.h: New type to replace places where int occurs as a boolean. It's signed because occasionally people may want to use -1 as an error value, and because unsigned ints are viral -- see comments in the internals manual against using them. dynarr.c: int -> Bytecount. --------------------------- Mule-izing --------------------------- device-x.c: Partially Mule-ize. dumper.c, dumper.h: Mule-ize. Use Rawbyte. Use stderr_out not printf. Use wext_*(). sysdep.c, syswindows.h, text.c: New Wexttext API for manipulation of external text that may be Unicode (e.g. startup code under Windows). emacs.c: Mule-ize. Properly deal with argv in external encoding. Use wext_*() and Wexttext. Use Rawbyte. #if 0 some old junk on SCO that is unlikely to be correct. Rewrite allocation code in run-temacs. emacs.c, symsinit.h, win32.c: Rename win32 init function and call it even earlier, to initialize mswindows_9x_p even earlier, for use in startup code (XEUNICODE_P). process.c: Use _wenviron not environ under Windows, to get Unicode environment variables. event-Xt.c: Mule-ize drag-n-drop related stuff. dragdrop.c, dragdrop.h, frame-x.c: Mule-ize. text.h: Add some more stand-in defines for particular kinds of conversion; use in Mule-ization work in frame-x.c etc. --------------------------- Freshening --------------------------- intl-auto-encap-win32.c, intl-auto-encap-win32.h: Regenerate. --------------------------- Unicode-work --------------------------- intl-win32.c, syswindows.h: Factor out common options to MultiByteToWideChar and WideCharToMultiByte. Add convert_unicode_to_multibyte_malloc() and convert_unicode_to_multibyte_dynarr() and use. Add stuff for alloca() conversion of multibyte/unicode. alloc.c: Use dfc_external_data_len() in case of unicode coding system. alloc.c, mule-charset.c: Don't zero out and reinit charset Unicode tables. This fucks up dump-time loading. Anyway, either we load them at dump time or run time, never both. unicode.c: Dump the blank tables as well. --------------------------------------------------------------- DOCUMENTATION, MOSTLY MULE-RELATED: --------------------------------------------------------------- EmacsFrame.c, emodules.c, event-Xt.c, fileio.c, input-method-xlib.c, mule-wnnfns.c, redisplay-gtk.c, redisplay-tty.c, redisplay-x.c, regex.c, sysdep.c: Add comment about Mule work needed. text.h: Add more documentation describing why DFC routines were not written to return their value. Add some other DFC documentation. console-msw.c, console-msw.h: Add pointer to docs in win32.c. emacs.c: Add comments on sources of doc info. text.c, charset.h, unicode.c, intl-win32.c, intl-encap-win32.c, text.h, file-coding.c, mule-coding.c: Collect background comments and related to text matters and internationalization, and proposals for work to be done, in text.c or Internals manual, stuff related to specific textual API's in text.h, and stuff related to internal implementation of Unicode conversion in unicode.c. Put lots of pointers to the comments to make them easier to find. s/mingw32.h, s/win32-common.h, s/win32-native.h, s/windowsnt.h, win32.c: Add bunches of new documentation on the different kinds of builds and environments under Windows and how they work. Collect this info in win32.c. Add pointers to these docs in the relevant s/* files. emacs.c: Document places with long comments. Remove comment about exiting, move to internals manual, put in pointer. event-stream.c: Move docs about event queues and focus to internals manual, put in pointer. events.h: Move docs about event stream callbacks to internals manual, put in pointer. profile.c, redisplay.c, signal.c: Move documentation to the Internals manual. process-nt.c: Add pointer to comment in win32-native.el. lisp.h: Add comments about some comment conventions. lisp.h: Add comment about the second argument. device-msw.c, redisplay-msw.c: @@#### comments are out-of-date. --------------------------------------------------------------- PDUMP WORK (MOTIVATED BY UNICODE CHANGES) --------------------------------------------------------------- alloc.c, buffer.c, bytecode.c, console-impl.h, console.c, device.c, dumper.c, lrecord.h, elhash.c, emodules.h, events.c, extents.c, frame.c, glyphs.c, glyphs.h, mule-charset.c, mule-coding.c, objects.c, profile.c, rangetab.c, redisplay.c, specifier.c, specifier.h, window.c, lstream.c, file-coding.h, file-coding.c: PDUMP: Properly implement dump_add_root_block(), which never worked before, and is necessary for dumping Unicode tables. Pdump name changes for accuracy: XD_STRUCT_PTR -> XD_BLOCK_PTR. XD_STRUCT_ARRAY -> XD_BLOCK_ARRAY. XD_C_STRING -> XD_ASCII_STRING. *_structure_* -> *_block_*. lrecord.h: some comments added about dump_add_root_block() vs dump_add_root_block_ptr(). extents.c: remove incorrect comment about pdump problems with gap array. --------------------------------------------------------------- ALLOCATION --------------------------------------------------------------- abbrev.c, alloc.c, bytecode.c, casefiddle.c, device-msw.c, device-x.c, dired-msw.c, doc.c, doprnt.c, dragdrop.c, editfns.c, emodules.c, file-coding.c, fileio.c, filelock.c, fns.c, glyphs-eimage.c, glyphs-gtk.c, glyphs-msw.c, glyphs-x.c, gui-msw.c, gui-x.c, imgproc.c, intl-win32.c, lread.c, menubar-gtk.c, menubar.c, nt.c, objects-msw.c, objects-x.c, print.c, process-nt.c, process-unix.c, process.c, realpath.c, redisplay.c, search.c, select-common.c, symbols.c, sysdep.c, syswindows.h, text.c, text.h, ui-byhand.c: New macros {alloca,xnew}_{itext,{i,ext,raw,bin,asc}bytes} for more convenient allocation of these commonly requested items. Modify functions to use alloca_ibytes, alloca_array, alloca_extbytes, xnew_ibytes, etc. also XREALLOC_ARRAY, xnew. alloc.c: Rewrite the allocation functions to factor out repeated code. Add assertions for freeing dumped data. lisp.h: Moved down and consolidated with other allocation stuff. lisp.h, dynarr.c: New functions for allocation that's very efficient when mostly in LIFO order. lisp.h, text.c, text.h: Factor out some stuff for general use by alloca()-conversion funs. text.h, lisp.h: Fill out convenience routines for allocating various kinds of bytes and put them in lisp.h. Use them in place of xmalloc(), ALLOCA(). text.h: Fill out the convenience functions so the _MALLOC() kinds match the alloca() kinds. --------------------------------------------------------------- ERROR-CHECKING --------------------------------------------------------------- text.h: Create ASSERT_ASCTEXT_ASCII() and ASSERT_ASCTEXT_ASCII_LEN() from similar Eistring checkers and change the Eistring checkers to use them instead. --------------------------------------------------------------- MACROS IN LISP.H --------------------------------------------------------------- lisp.h: Redo GCPRO declarations. Create a "base" set of functions that can be used to generate any kind of gcpro sets -- regular, ngcpro, nngcpro, private ones used in GC_EXTERNAL_LIST_LOOP_2. buffer.c, callint.c, chartab.c, console-msw.c, device-x.c, dialog-msw.c, dired.c, extents.c, ui-gtk.c, rangetab.c, nt.c, mule-coding.c, minibuf.c, menubar-msw.c, menubar.c, menubar-gtk.c, lread.c, lisp.h, gutter.c, glyphs.c, glyphs-widget.c, fns.c, fileio.c, file-coding.c, specifier.c: Eliminate EXTERNAL_LIST_LOOP, which does not check for circularities. Use EXTERNAL_LIST_LOOP_2 instead or EXTERNAL_LIST_LOOP_3 or EXTERNAL_PROPERTY_LIST_LOOP_3 or GC_EXTERNAL_LIST_LOOP_2 (new macro). Removed/redid comments on EXTERNAL_LIST_LOOP. --------------------------------------------------------------- SPACING FIXES --------------------------------------------------------------- callint.c, hftctl.c, number-gmp.c, process-unix.c: Spacing fixes. --------------------------------------------------------------- FIX FOR GEOMETRY PROBLEM IN FIRST FRAME --------------------------------------------------------------- unicode.c: Add workaround for newlib bug in sscanf() [should be fixed by release 1.5.12 of Cygwin]. toolbar.c: bug fix for problem of initial frame being 77 chars wide on Windows. will be overridden by my other ws. --------------------------------------------------------------- FIX FOR LEAKING PROCESS HANDLES: --------------------------------------------------------------- process-nt.c: Fixes for leaking handles. Inspired by work done by Adrian Aichner <adrian@xemacs.org>. --------------------------------------------------------------- FIX FOR CYGWIN BUG (Unicode-related): --------------------------------------------------------------- unicode.c: Add workaround for newlib bug in sscanf() [should be fixed by release 1.5.12 of Cygwin]. --------------------------------------------------------------- WARNING FIXES: --------------------------------------------------------------- console-stream.c: `reinit' is unused. compiler.h, event-msw.c, frame-msw.c, intl-encap-win32.c, text.h: Add stuff to deal with ANSI-aliasing warnings I got. regex.c: Gather includes together to avoid warning. --------------------------------------------------------------- CHANGES TO INITIALIZATION ROUTINES: --------------------------------------------------------------- buffer.c, emacs.c, console.c, debug.c, device-x.c, device.c, dragdrop.c, emodules.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, event-tty.c, events.c, extents.c, faces.c, file-coding.c, fileio.c, font-lock.c, frame-msw.c, glyphs-widget.c, glyphs.c, gui-x.c, insdel.c, lread.c, lstream.c, menubar-gtk.c, menubar-x.c, minibuf.c, mule-wnnfns.c, objects-msw.c, objects.c, print.c, scrollbar-x.c, search.c, select-x.c, text.c, undo.c, unicode.c, window.c, symsinit.h: Call reinit_*() functions directly from emacs.c, for clarity. Factor out some redundant init code. Move disallowed stuff that had crept into vars_of_glyphs() into complex_vars_of_glyphs(). Call init_eval_semi_early() from eval.c not in the middle of vars_of_() in emacs.c since there should be no order dependency in the latter calls. --------------------------------------------------------------- ARMAGEDDON: --------------------------------------------------------------- alloc.c, emacs.c, lisp.h, print.c: Rename inhibit_non_essential_printing_operations to inhibit_non_essential_conversion_operations. text.c: Assert on !inhibit_non_essential_conversion_operations. console-msw.c, print.c: Don't do conversion in SetConsoleTitle or FindWindow to avoid problems during armageddon. Put #errors for NON_ASCII_INTERNAL_FORMAT in places where problems would arise. --------------------------------------------------------------- CHANGES TO THE BUILD PROCEDURE: --------------------------------------------------------------- config.h.in, s/cxux.h, s/usg5-4-2.h, m/powerpc.h: Add comment about correct ordering of this file. Rearrange everything to follow this -- put all #undefs together and before the s&m files. Add undefs for HAVE_ALLOCA, C_ALLOCA, BROKEN_ALLOCA_IN_FUNCTION_CALLS, STACK_DIRECTION. Remove unused HAVE_STPCPY, HAVE_GETWD, HAVE_SETLOCALE. m/gec63.h: Deleted; totally broken, not used at all, not in FSF. m/7300.h, m/acorn.h, m/alliant-2800.h, m/alliant.h, m/altos.h, m/amdahl.h, m/apollo.h, m/att3b.h, m/aviion.h, m/celerity.h, m/clipper.h, m/cnvrgnt.h, m/convex.h, m/cydra5.h, m/delta.h, m/delta88k.h, m/dpx2.h, m/elxsi.h, m/ews4800r.h, m/gould.h, m/hp300bsd.h, m/hp800.h, m/hp9000s300.h, m/i860.h, m/ibmps2-aix.h, m/ibmrs6000.h, m/ibmrt-aix.h, m/ibmrt.h, m/intel386.h, m/iris4d.h, m/iris5d.h, m/iris6d.h, m/irist.h, m/isi-ov.h, m/luna88k.h, m/m68k.h, m/masscomp.h, m/mg1.h, m/mips-nec.h, m/mips-siemens.h, m/mips.h, m/news.h, m/nh3000.h, m/nh4000.h, m/ns32000.h, m/orion105.h, m/pfa50.h, m/plexus.h, m/pmax.h, m/powerpc.h, m/pyrmips.h, m/sequent-ptx.h, m/sequent.h, m/sgi-challenge.h, m/symmetry.h, m/tad68k.h, m/tahoe.h, m/targon31.h, m/tekxd88.h, m/template.h, m/tower32.h, m/tower32v3.h, m/ustation.h, m/vax.h, m/wicat.h, m/xps100.h: Delete C_ALLOCA, HAVE_ALLOCA, STACK_DIRECTION, BROKEN_ALLOCA_IN_FUNCTION_CALLS. All of this is auto-detected. When in doubt, I followed recent FSF sources, which also have these things deleted.
author ben
date Thu, 04 Nov 2004 23:08:28 +0000
parents 04bc9d2f42c7
children a25c824ed558
comparison
equal deleted inserted replaced
2366:2a392e0c390a 2367:ecf1ebac70d8
26 /* Authorship: 26 /* Authorship:
27 27
28 Ben Wing: January 1996, for 19.14. 28 Ben Wing: January 1996, for 19.14.
29 Rewritten for mswindows by Jonathan Harris, November 1997 for 21.0 29 Rewritten for mswindows by Jonathan Harris, November 1997 for 21.0
30 */ 30 */
31
32 /* See win32.c for info about the different Windows files in XEmacs. */
31 33
32 #include <config.h> 34 #include <config.h>
33 #include "lisp.h" 35 #include "lisp.h"
34 36
35 #include "console-msw-impl.h" 37 #include "console-msw-impl.h"
90 /* Based on Microsoft KB article Q124103 */ 92 /* Based on Microsoft KB article Q124103 */
91 static HWND 93 static HWND
92 GetConsoleHwnd (void) 94 GetConsoleHwnd (void)
93 { 95 {
94 HWND hwndFound; 96 HWND hwndFound;
95 Ibyte newtitleint[200]; 97 Ascbyte newtitle[100];
96 Extbyte *newtitle;
97 Extbyte *oldtitle; 98 Extbyte *oldtitle;
98 int numchars; 99 int numchars;
99 100
100 /* fetch current window title */ 101 /* fetch current window title */
101 102
110 while (numchars >= size - 1); 111 while (numchars >= size - 1);
111 } 112 }
112 113
113 /* format a "unique" new title */ 114 /* format a "unique" new title */
114 115
115 qxesprintf (newtitleint, "%ld/%ld", GetTickCount (), 116 sprintf (newtitle, "%ld/%ld", GetTickCount (), GetCurrentProcessId ());
116 GetCurrentProcessId ()); 117
117 118 /* change current window title; we may be called during armageddon
118 C_STRING_TO_TSTR (newtitleint, newtitle); 119 so don't do any conversion */
119 120
120 /* change current window title */ 121 SetConsoleTitleA (newtitle);
121
122 qxeSetConsoleTitle (newtitle);
123 122
124 /* ensure window title has been updated */ 123 /* ensure window title has been updated */
125 124
126 Sleep (40); 125 Sleep (40);
127 126
128 /* look for NewWindowTitle */ 127 /* look for NewWindowTitle */
129 128
130 hwndFound = qxeFindWindow (NULL, newtitle); 129 hwndFound = FindWindowA (NULL, newtitle);
131 130
132 /* restore original window title */ 131 /* restore original window title */
133 132
134 qxeSetConsoleTitle (oldtitle); 133 qxeSetConsoleTitle (oldtitle);
135 134
240 239
241 mswindows_message_outputted = 1; 240 mswindows_message_outputted = 1;
242 mswindows_ensure_console_buffered (); 241 mswindows_ensure_console_buffered ();
243 mswindows_show_console (); 242 mswindows_show_console ();
244 243
245 if (initialized && !inhibit_non_essential_printing_operations) 244 if (initialized && !inhibit_non_essential_conversion_operations)
246 { 245 {
247 const Extbyte *extptr; 246 const Extbyte *extptr;
248 Bytecount extlen; 247 Bytecount extlen;
249 TO_EXTERNAL_FORMAT (DATA, (ptr, len), 248 TO_EXTERNAL_FORMAT (DATA, (ptr, len),
250 ALLOCA, (extptr, extlen), 249 ALLOCA, (extptr, extlen),
251 Qmswindows_tstr); 250 Qmswindows_tstr);
252 return qxeWriteConsole (mswindows_console_buffer, extptr, 251 return qxeWriteConsole (mswindows_console_buffer, extptr,
253 extlen / XETCHAR_SIZE, &num_written, NULL); 252 extlen / XETCHAR_SIZE, &num_written, NULL);
254 } 253 }
255 else 254 else
256 return WriteConsoleA (mswindows_console_buffer, (char *) ptr, len, 255 #ifdef NON_ASCII_INTERNAL_FORMAT
256 #error Do something here
257 #endif
258 return WriteConsoleA (mswindows_console_buffer, (Chbyte *) ptr, len,
257 &num_written, NULL); 259 &num_written, NULL);
258 } 260 }
259 261
260 DEFUN ("mswindows-debugging-output", Fmswindows_debugging_output, 1, 1, 0, /* 262 DEFUN ("mswindows-debugging-output", Fmswindows_debugging_output, 1, 1, 0, /*
261 Write CHAR-OR-STRING to the Windows debugger, using OutputDebugString(). 263 Write CHAR-OR-STRING to the Windows debugger, using OutputDebugString().
283 285
284 void 286 void
285 write_string_to_mswindows_debugging_output (const Ibyte *str, Bytecount len) 287 write_string_to_mswindows_debugging_output (const Ibyte *str, Bytecount len)
286 { 288 {
287 const Extbyte *extptr; 289 const Extbyte *extptr;
288 if (initialized && !inhibit_non_essential_printing_operations) 290 if (initialized && !inhibit_non_essential_conversion_operations)
289 { 291 {
290 TO_EXTERNAL_FORMAT (DATA, (str, len), 292 TO_EXTERNAL_FORMAT (DATA, (str, len),
291 C_STRING_ALLOCA, extptr, 293 C_STRING_ALLOCA, extptr,
292 Qmswindows_tstr); 294 Qmswindows_tstr);
293 qxeOutputDebugString (extptr); 295 qxeOutputDebugString (extptr);
294 } 296 }
295 else 297 else
296 { 298 {
299 #ifdef NON_ASCII_INTERNAL_FORMAT
300 #error Do something here
301 #endif
297 /* STR may not be null-terminated so make it that way. */ 302 /* STR may not be null-terminated so make it that way. */
298 Extbyte *ext = alloca_extbytes (len + 1); 303 Extbyte *ext = alloca_extbytes (len + 1);
299 memcpy (ext, str, len); 304 memcpy (ext, str, len);
300 ext[len] = '\0'; 305 ext[len] = '\0';
301 OutputDebugStringA (ext); 306 OutputDebugStringA (ext);
503 `cancel' value if either the ESC key is pressed or the Cancel button 508 `cancel' value if either the ESC key is pressed or the Cancel button
504 is selected. If the message box has no Cancel button, pressing ESC has 509 is selected. If the message box has no Cancel button, pressing ESC has
505 no effect. */ 510 no effect. */
506 (message_, flags, title)) 511 (message_, flags, title))
507 { 512 {
508 Lisp_Object tail;
509 Extbyte *msgout; 513 Extbyte *msgout;
510 Extbyte *titleout = 0; 514 Extbyte *titleout = 0;
511 UINT sty = 0; 515 UINT sty = 0;
512 516
513 if (!LISTP (flags)) 517 if (!LISTP (flags))
523 { 527 {
524 CHECK_STRING (title); 528 CHECK_STRING (title);
525 LISP_STRING_TO_TSTR (title, titleout); 529 LISP_STRING_TO_TSTR (title, titleout);
526 } 530 }
527 531
528 EXTERNAL_LIST_LOOP (tail, flags) 532 {
529 { 533 EXTERNAL_LIST_LOOP_2 (st, flags)
530 Lisp_Object st = XCAR (tail); 534 {
531 CHECK_SYMBOL (st); 535 CHECK_SYMBOL (st);
532 if (0) 536 if (0)
533 ; 537 ;
534 #define FROB(sym, val) else if (EQ (st, sym)) sty |= val 538 #define FROB(sym, val) else if (EQ (st, sym)) sty |= val
535 FROB (Qabortretryignore, MB_ABORTRETRYIGNORE); 539 FROB (Qabortretryignore, MB_ABORTRETRYIGNORE);
536 FROB (Qapplmodal, MB_APPLMODAL); 540 FROB (Qapplmodal, MB_APPLMODAL);
537 FROB (Qdefault_desktop_only, MB_DEFAULT_DESKTOP_ONLY); 541 FROB (Qdefault_desktop_only, MB_DEFAULT_DESKTOP_ONLY);
538 FROB (Qdefbutton1, MB_DEFBUTTON1); 542 FROB (Qdefbutton1, MB_DEFBUTTON1);
539 FROB (Qdefbutton2, MB_DEFBUTTON2); 543 FROB (Qdefbutton2, MB_DEFBUTTON2);
540 FROB (Qdefbutton3, MB_DEFBUTTON3); 544 FROB (Qdefbutton3, MB_DEFBUTTON3);
541 FROB (Qdefbutton4, MB_DEFBUTTON4); 545 FROB (Qdefbutton4, MB_DEFBUTTON4);
542 FROB (Qhelp, MB_HELP); 546 FROB (Qhelp, MB_HELP);
543 FROB (Qiconasterisk, MB_ICONASTERISK); 547 FROB (Qiconasterisk, MB_ICONASTERISK);
544 FROB (Qiconexclamation, MB_ICONEXCLAMATION); 548 FROB (Qiconexclamation, MB_ICONEXCLAMATION);
545 FROB (Qiconhand, MB_ICONHAND); 549 FROB (Qiconhand, MB_ICONHAND);
546 FROB (Qiconinformation, MB_ICONINFORMATION); 550 FROB (Qiconinformation, MB_ICONINFORMATION);
547 FROB (Qiconquestion, MB_ICONQUESTION); 551 FROB (Qiconquestion, MB_ICONQUESTION);
548 FROB (Qiconstop, MB_ICONSTOP); 552 FROB (Qiconstop, MB_ICONSTOP);
549 FROB (Qok, MB_OK); 553 FROB (Qok, MB_OK);
550 FROB (Qokcancel, MB_OKCANCEL); 554 FROB (Qokcancel, MB_OKCANCEL);
551 FROB (Qretrycancel, MB_RETRYCANCEL); 555 FROB (Qretrycancel, MB_RETRYCANCEL);
552 FROB (Qright, MB_RIGHT); 556 FROB (Qright, MB_RIGHT);
553 FROB (Qrtlreading, MB_RTLREADING); 557 FROB (Qrtlreading, MB_RTLREADING);
554 FROB (Qservice_notification, MB_SERVICE_NOTIFICATION); 558 FROB (Qservice_notification, MB_SERVICE_NOTIFICATION);
555 FROB (Qsetforeground, MB_SETFOREGROUND); 559 FROB (Qsetforeground, MB_SETFOREGROUND);
556 FROB (Qsystemmodal, MB_SYSTEMMODAL); 560 FROB (Qsystemmodal, MB_SYSTEMMODAL);
557 FROB (Qtaskmodal, MB_TASKMODAL); 561 FROB (Qtaskmodal, MB_TASKMODAL);
558 FROB (Qtopmost, MB_TOPMOST); 562 FROB (Qtopmost, MB_TOPMOST);
559 FROB (Qyesno, MB_YESNO); 563 FROB (Qyesno, MB_YESNO);
560 FROB (Qyesnocancel, MB_YESNOCANCEL); 564 FROB (Qyesnocancel, MB_YESNOCANCEL);
561 #undef FROB 565 #undef FROB
562 566
563 else 567 else
564 invalid_constant ("Unrecognized flag", st); 568 invalid_constant ("Unrecognized flag", st);
565 } 569 }
570 }
566 571
567 { 572 {
568 int retval = qxeMessageBox (NULL, msgout, titleout, sty); 573 int retval = qxeMessageBox (NULL, msgout, titleout, sty);
569 574
570 if (retval == 0) 575 if (retval == 0)