Mercurial > dwindows
comparison dw.h @ 1483:73f2ad84d4ec
Fixed OS/2 windows being shown when setting position/size.
Moved the OS/2 specific DW_OS2_NEW_WINDOW flag into os2/dw.c.
Deprecated and essentially removed DW_FCF_SHELLPOSITION and
DW_FCF_NOBYTEALIGN. These were OS/2 specific and are set
automatically now... FCF_SHELLPOSITION was causing the
positioning problems that necessitated the window being shown
to set the size and position. Right now SHELLPOSITION isn't
used at all... causing shell positioning to not work.
I hope to have a way to allow shell positioning to work again
soon but the idea I had to do this did not work.
| author | bsmith@81767d24-ef19-dc11-ae90-00e081727c95 |
|---|---|
| date | Fri, 23 Dec 2011 15:58:13 +0000 |
| parents | b2235efd9914 |
| children | 026c0b4d6ee9 |
comparison
equal
deleted
inserted
replaced
| 1482:dd584f431f9f | 1483:73f2ad84d4ec |
|---|---|
| 135 #define DW_FCF_MINMAX FCF_MINMAX | 135 #define DW_FCF_MINMAX FCF_MINMAX |
| 136 #define DW_FCF_VERTSCROLL FCF_VERTSCROLL | 136 #define DW_FCF_VERTSCROLL FCF_VERTSCROLL |
| 137 #define DW_FCF_HORZSCROLL FCF_HORZSCROLL | 137 #define DW_FCF_HORZSCROLL FCF_HORZSCROLL |
| 138 #define DW_FCF_DLGBORDER FCF_DLGBORDER | 138 #define DW_FCF_DLGBORDER FCF_DLGBORDER |
| 139 #define DW_FCF_BORDER FCF_BORDER | 139 #define DW_FCF_BORDER FCF_BORDER |
| 140 #define DW_FCF_SHELLPOSITION FCF_SHELLPOSITION | |
| 141 #define DW_FCF_TASKLIST FCF_TASKLIST | 140 #define DW_FCF_TASKLIST FCF_TASKLIST |
| 142 #define DW_FCF_NOBYTEALIGN FCF_NOBYTEALIGN | |
| 143 #define DW_FCF_NOMOVEWITHOWNER FCF_NOMOVEWITHOWNER | 141 #define DW_FCF_NOMOVEWITHOWNER FCF_NOMOVEWITHOWNER |
| 144 #define DW_FCF_SYSMODAL FCF_SYSMODAL | 142 #define DW_FCF_SYSMODAL FCF_SYSMODAL |
| 145 #define DW_FCF_HIDEBUTTON FCF_HIDEBUTTON | 143 #define DW_FCF_HIDEBUTTON FCF_HIDEBUTTON |
| 146 #define DW_FCF_HIDEMAX FCF_HIDEMAX | 144 #define DW_FCF_HIDEMAX FCF_HIDEMAX |
| 147 #define DW_FCF_AUTOICON FCF_AUTOICON | 145 #define DW_FCF_AUTOICON FCF_AUTOICON |
| 173 #define DW_POINTER_ARROW SPTR_ARROW | 171 #define DW_POINTER_ARROW SPTR_ARROW |
| 174 #define DW_POINTER_CLOCK SPTR_WAIT | 172 #define DW_POINTER_CLOCK SPTR_WAIT |
| 175 #define DW_POINTER_QUESTION SPTR_ICONQUESTION | 173 #define DW_POINTER_QUESTION SPTR_ICONQUESTION |
| 176 | 174 |
| 177 #define DW_BS_NOBORDER BS_NOBORDER | 175 #define DW_BS_NOBORDER BS_NOBORDER |
| 178 | |
| 179 #define DW_OS2_NEW_WINDOW 1 | |
| 180 | 176 |
| 181 /* flag values for dw_messagebox() */ | 177 /* flag values for dw_messagebox() */ |
| 182 #define DW_MB_OK MB_OK | 178 #define DW_MB_OK MB_OK |
| 183 #define DW_MB_OKCANCEL MB_OKCANCEL | 179 #define DW_MB_OKCANCEL MB_OKCANCEL |
| 184 #define DW_MB_YESNO MB_YESNO | 180 #define DW_MB_YESNO MB_YESNO |
| 350 #define DW_FCF_MINMAX (1 << 2) /* NSMiniaturizableWindowMask */ | 346 #define DW_FCF_MINMAX (1 << 2) /* NSMiniaturizableWindowMask */ |
| 351 #define DW_FCF_VERTSCROLL 0 | 347 #define DW_FCF_VERTSCROLL 0 |
| 352 #define DW_FCF_HORZSCROLL 0 | 348 #define DW_FCF_HORZSCROLL 0 |
| 353 #define DW_FCF_DLGBORDER 0 | 349 #define DW_FCF_DLGBORDER 0 |
| 354 #define DW_FCF_BORDER 0 | 350 #define DW_FCF_BORDER 0 |
| 355 #define DW_FCF_SHELLPOSITION 0 | |
| 356 #define DW_FCF_TASKLIST 0 | 351 #define DW_FCF_TASKLIST 0 |
| 357 #define DW_FCF_NOBYTEALIGN 0 | |
| 358 #define DW_FCF_NOMOVEWITHOWNER 0 | 352 #define DW_FCF_NOMOVEWITHOWNER 0 |
| 359 #define DW_FCF_SYSMODAL 0 | 353 #define DW_FCF_SYSMODAL 0 |
| 360 #define DW_FCF_HIDEBUTTON 0 | 354 #define DW_FCF_HIDEBUTTON 0 |
| 361 #define DW_FCF_HIDEMAX 0 | 355 #define DW_FCF_HIDEMAX 0 |
| 362 #define DW_FCF_AUTOICON 0 | 356 #define DW_FCF_AUTOICON 0 |
| 533 #define DW_FCF_MINMAX (WS_MINIMIZEBOX|WS_MAXIMIZEBOX) | 527 #define DW_FCF_MINMAX (WS_MINIMIZEBOX|WS_MAXIMIZEBOX) |
| 534 #define DW_FCF_VERTSCROLL WS_VSCROLL | 528 #define DW_FCF_VERTSCROLL WS_VSCROLL |
| 535 #define DW_FCF_HORZSCROLL WS_HSCROLL | 529 #define DW_FCF_HORZSCROLL WS_HSCROLL |
| 536 #define DW_FCF_DLGBORDER WS_DLGFRAME | 530 #define DW_FCF_DLGBORDER WS_DLGFRAME |
| 537 #define DW_FCF_BORDER WS_BORDER | 531 #define DW_FCF_BORDER WS_BORDER |
| 538 #define DW_FCF_SHELLPOSITION 0 | |
| 539 #define DW_FCF_TASKLIST WS_VSCROLL | 532 #define DW_FCF_TASKLIST WS_VSCROLL |
| 540 #define DW_FCF_NOBYTEALIGN 0 | |
| 541 #define DW_FCF_NOMOVEWITHOWNER 0 | 533 #define DW_FCF_NOMOVEWITHOWNER 0 |
| 542 #define DW_FCF_SYSMODAL 0 | 534 #define DW_FCF_SYSMODAL 0 |
| 543 #define DW_FCF_HIDEBUTTON WS_MINIMIZEBOX | 535 #define DW_FCF_HIDEBUTTON WS_MINIMIZEBOX |
| 544 #define DW_FCF_HIDEMAX (WS_MINIMIZEBOX|WS_MAXIMIZEBOX) | 536 #define DW_FCF_HIDEMAX (WS_MINIMIZEBOX|WS_MAXIMIZEBOX) |
| 545 #define DW_FCF_AUTOICON 0 | 537 #define DW_FCF_AUTOICON 0 |
| 816 #define DW_FCF_MINMAX (Ph_WM_RENDER_MIN|Ph_WM_RENDER_MAX) | 808 #define DW_FCF_MINMAX (Ph_WM_RENDER_MIN|Ph_WM_RENDER_MAX) |
| 817 #define DW_FCF_VERTSCROLL 0 | 809 #define DW_FCF_VERTSCROLL 0 |
| 818 #define DW_FCF_HORZSCROLL 0 | 810 #define DW_FCF_HORZSCROLL 0 |
| 819 #define DW_FCF_DLGBORDER 0 | 811 #define DW_FCF_DLGBORDER 0 |
| 820 #define DW_FCF_BORDER Ph_WM_RENDER_BORDER | 812 #define DW_FCF_BORDER Ph_WM_RENDER_BORDER |
| 821 #define DW_FCF_SHELLPOSITION 0 | |
| 822 #define DW_FCF_TASKLIST 0 | 813 #define DW_FCF_TASKLIST 0 |
| 823 #define DW_FCF_NOBYTEALIGN 0 | |
| 824 #define DW_FCF_NOMOVEWITHOWNER 0 | 814 #define DW_FCF_NOMOVEWITHOWNER 0 |
| 825 #define DW_FCF_SYSMODAL 0 | 815 #define DW_FCF_SYSMODAL 0 |
| 826 #define DW_FCF_HIDEBUTTON 0 | 816 #define DW_FCF_HIDEBUTTON 0 |
| 827 #define DW_FCF_HIDEMAX 0 | 817 #define DW_FCF_HIDEMAX 0 |
| 828 #define DW_FCF_AUTOICON (Ph_WM_RENDER_ASICON | ~Ph_WM_RENDER_ASAPP) | 818 #define DW_FCF_AUTOICON (Ph_WM_RENDER_ASICON | ~Ph_WM_RENDER_ASAPP) |
| 1001 #define DW_FCF_MINMAX (1 << 6) | 991 #define DW_FCF_MINMAX (1 << 6) |
| 1002 #define DW_FCF_VERTSCROLL (1 << 7) | 992 #define DW_FCF_VERTSCROLL (1 << 7) |
| 1003 #define DW_FCF_HORZSCROLL (1 << 8) | 993 #define DW_FCF_HORZSCROLL (1 << 8) |
| 1004 #define DW_FCF_DLGBORDER (1 << 9) | 994 #define DW_FCF_DLGBORDER (1 << 9) |
| 1005 #define DW_FCF_BORDER (1 << 10) | 995 #define DW_FCF_BORDER (1 << 10) |
| 1006 #define DW_FCF_SHELLPOSITION (1 << 11) | |
| 1007 #define DW_FCF_TASKLIST (1 << 12) | 996 #define DW_FCF_TASKLIST (1 << 12) |
| 1008 #define DW_FCF_NOBYTEALIGN (1 << 13) | |
| 1009 #define DW_FCF_NOMOVEWITHOWNER (1 << 14) | 997 #define DW_FCF_NOMOVEWITHOWNER (1 << 14) |
| 1010 #define DW_FCF_SYSMODAL (1 << 15) | 998 #define DW_FCF_SYSMODAL (1 << 15) |
| 1011 #define DW_FCF_HIDEBUTTON (1 << 16) | 999 #define DW_FCF_HIDEBUTTON (1 << 16) |
| 1012 #define DW_FCF_HIDEMAX (1 << 17) | 1000 #define DW_FCF_HIDEMAX (1 << 17) |
| 1013 #define DW_FCF_AUTOICON (1 << 18) | 1001 #define DW_FCF_AUTOICON (1 << 18) |
| 1356 #define DW_TIMEOUT_INFINITE ((unsigned long)-1) | 1344 #define DW_TIMEOUT_INFINITE ((unsigned long)-1) |
| 1357 | 1345 |
| 1358 /* Obsolete, should disappear sometime */ | 1346 /* Obsolete, should disappear sometime */ |
| 1359 #define BOXHORZ DW_HORZ | 1347 #define BOXHORZ DW_HORZ |
| 1360 #define BOXVERT DW_VERT | 1348 #define BOXVERT DW_VERT |
| 1361 | 1349 #define DW_FCF_SHELLPOSITION 0 |
| 1350 #define DW_FCF_NOBYTEALIGN 0 | |
| 1351 | |
| 1352 /* Scrolling constants */ | |
| 1362 #define DW_SCROLL_UP 0 | 1353 #define DW_SCROLL_UP 0 |
| 1363 #define DW_SCROLL_DOWN 1 | 1354 #define DW_SCROLL_DOWN 1 |
| 1364 #define DW_SCROLL_TOP 2 | 1355 #define DW_SCROLL_TOP 2 |
| 1365 #define DW_SCROLL_BOTTOM 3 | 1356 #define DW_SCROLL_BOTTOM 3 |
| 1366 | 1357 |