comparison dw.h @ 2376:e6449653a30b

Mac: On ARM (M1) NSTextAlignmentCenter and NSTextAligmnentRight are swapped. Also update some of the symbolic names in the header to the new names. I made the comments long ago before Apple changed the symbolic names.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Thu, 18 Mar 2021 03:16:13 +0000
parents df0a66945296
children 5bb3491ceba2
comparison
equal deleted inserted replaced
2375:6feefce31675 2376:e6449653a30b
402 HWND handle; 402 HWND handle;
403 } *HPIXMAP; 403 } *HPIXMAP;
404 404
405 void _dw_pool_drain(void); 405 void _dw_pool_drain(void);
406 406
407 #define DW_DT_LEFT 0 /* NSLeftTextAlignment */ 407 #define DW_DT_LEFT 0 /* NSTextAlignmentLeft */
408 #define DW_DT_QUERYEXTENT 0 408 #define DW_DT_QUERYEXTENT 0
409 #define DW_DT_UNDERSCORE 0 409 #define DW_DT_UNDERSCORE 0
410 #define DW_DT_STRIKEOUT 0 410 #define DW_DT_STRIKEOUT 0
411 #define DW_DT_TEXTATTRS 0 411 #define DW_DT_TEXTATTRS 0
412 #define DW_DT_EXTERNALLEADING 0 412 #define DW_DT_EXTERNALLEADING 0
413 #define DW_DT_CENTER 2 /* NSCenterTextAlignment */ 413 #ifdef __aarch64__
414 #define DW_DT_RIGHT 1 /* NSRightTextAlignment */ 414 #define DW_DT_CENTER 1 /* NSTextAlignmentCenter */
415 #define DW_DT_RIGHT 2 /* NSTextAlignmentRight */
416 #else
417 #define DW_DT_CENTER 2 /* NSTextAlignmentCenter */
418 #define DW_DT_RIGHT 1 /* NSTextAlignmentRight */
419 #endif
415 #define DW_DT_TOP 0 420 #define DW_DT_TOP 0
416 #define DW_DT_VCENTER (1 << 10) 421 #define DW_DT_VCENTER (1 << 10)
417 #define DW_DT_BOTTOM 0 422 #define DW_DT_BOTTOM 0
418 #define DW_DT_HALFTONE 0 423 #define DW_DT_HALFTONE 0
419 #define DW_DT_MNEMONIC 0 424 #define DW_DT_MNEMONIC 0
420 #define DW_DT_WORDBREAK (1 << 11) 425 #define DW_DT_WORDBREAK (1 << 11)
421 #define DW_DT_ERASERECT 0 426 #define DW_DT_ERASERECT 0
422 427
423 #define DW_FCF_CLOSEBUTTON (1 << 1) /* NSClosableWindowMask */ 428 #define DW_FCF_CLOSEBUTTON (1 << 1) /* NSWindowStyleMaskClosable */
424 #define DW_FCF_TITLEBAR (1 << 0) /* NSTitledWindowMask */ 429 #define DW_FCF_TITLEBAR (1 << 0) /* NSWindowStyleMaskTitled */
425 #define DW_FCF_SYSMENU (1 << 1) /* NSClosableWindowMask */ 430 #define DW_FCF_SYSMENU (1 << 1) /* NSWindowStyleMaskClosable */
426 #define DW_FCF_MENU 0 431 #define DW_FCF_MENU 0
427 #define DW_FCF_SIZEBORDER (1 << 3) /* NSResizableWindowMask */ 432 #define DW_FCF_SIZEBORDER (1 << 3) /* NSWindowStyleMaskResizable */
428 #define DW_FCF_MINBUTTON (1 << 2) /* NSMiniaturizableWindowMask */ 433 #define DW_FCF_MINBUTTON (1 << 2) /* NSWindowStyleMaskMiniaturizable */
429 #define DW_FCF_MAXBUTTON 0 434 #define DW_FCF_MAXBUTTON 0
430 #define DW_FCF_MINMAX (1 << 2) /* NSMiniaturizableWindowMask */ 435 #define DW_FCF_MINMAX (1 << 2) /* NSWindowStyleMaskMiniaturizable */
431 #define DW_FCF_DLGBORDER 0 436 #define DW_FCF_DLGBORDER 0
432 #define DW_FCF_BORDER 0 437 #define DW_FCF_BORDER 0
433 #define DW_FCF_TASKLIST 0 438 #define DW_FCF_TASKLIST 0
434 #define DW_FCF_NOMOVEWITHOWNER 0 439 #define DW_FCF_NOMOVEWITHOWNER 0
435 #define DW_FCF_SYSMODAL 0 440 #define DW_FCF_SYSMODAL 0
436 #define DW_FCF_HIDEBUTTON 0 441 #define DW_FCF_HIDEBUTTON 0
437 #define DW_FCF_HIDEMAX 0 442 #define DW_FCF_HIDEMAX 0
438 #define DW_FCF_AUTOICON 0 443 #define DW_FCF_AUTOICON 0
439 #define DW_FCF_MAXIMIZE 0 444 #define DW_FCF_MAXIMIZE 0
440 #define DW_FCF_MINIMIZE 0 445 #define DW_FCF_MINIMIZE 0
441 #define DW_FCF_TEXTURED (1 << 8) /* NSTexturedBackgroundWindowMask */ 446 #define DW_FCF_TEXTURED (1 << 8) /* NSWindowStyleMaskTexturedBackground */
442 #define DW_FCF_FULLSCREEN (1 << 4) 447 #define DW_FCF_FULLSCREEN (1 << 4)
443 448
444 #define DW_CFA_BITMAPORICON 1 449 #define DW_CFA_BITMAPORICON 1
445 #define DW_CFA_STRING (1 << 1) 450 #define DW_CFA_STRING (1 << 1)
446 #define DW_CFA_ULONG (1 << 2) 451 #define DW_CFA_ULONG (1 << 2)