- Timestamp:
- Feb 5, 2000, 8:45:19 PM (26 years ago)
- Location:
- trunk/src/user32
- Files:
-
- 8 edited
-
button.cpp (modified) (6 diffs)
-
edit.cpp (modified) (2 diffs)
-
oslibwin.cpp (modified) (5 diffs)
-
oslibwin.h (modified) (2 diffs)
-
user32.rc (modified) (14 diffs)
-
win32wbase.cpp (modified) (10 diffs)
-
win32wbase.h (modified) (3 diffs)
-
win32wbasenonclient.cpp (modified) (6 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/user32/button.cpp
r2611 r2666 1 /* $Id: button.cpp,v 1.3 1 2000-02-03 17:13:00cbratschi Exp $ */1 /* $Id: button.cpp,v 1.32 2000-02-05 19:45:14 cbratschi Exp $ */ 2 2 /* File: button.cpp -- Button type widgets 3 3 * … … 688 688 } 689 689 690 static INT BUTTON_GetTextFormat(DWORD dwStyle, INT defHorz,INT defVert)690 static INT BUTTON_GetTextFormat(DWORD dwStyle,DWORD dwExStyle,INT defHorz,INT defVert) 691 691 { 692 692 INT format = 0; … … 694 694 if (dwStyle & BS_LEFT) format = DT_LEFT; 695 695 else if (dwStyle & BS_CENTER) format = DT_CENTER; 696 else if ( dwStyle & BS_RIGHT) format = DT_RIGHT;696 else if ((dwStyle & BS_RIGHT) || (dwExStyle & WS_EX_RIGHT)) format = DT_RIGHT; 697 697 else format = defHorz; 698 698 … … 775 775 if ((textLen > 0) && (!(dwStyle & (BS_ICON|BS_BITMAP)))) 776 776 { 777 INT format = BUTTON_GetTextFormat(dwStyle, DT_CENTER,DT_VCENTER);777 INT format = BUTTON_GetTextFormat(dwStyle,GetWindowLongA(hwnd,GWL_EXSTYLE),DT_CENTER,DT_VCENTER); 778 778 779 779 textLen++; … … 999 999 if( text && action != ODA_SELECT ) 1000 1000 { 1001 INT format = BUTTON_GetTextFormat(dwStyle, DT_TOP,DT_VCENTER);1001 INT format = BUTTON_GetTextFormat(dwStyle,GetWindowLongA(hwnd,GWL_EXSTYLE),DT_TOP,DT_VCENTER); 1002 1002 1003 1003 if (dwStyle & WS_DISABLED) DrawDisabledText(hDC,text,&rtext,format); … … 1084 1084 if (textLen > 0) 1085 1085 { 1086 INT format = BUTTON_GetTextFormat(dwStyle, DT_LEFT,DT_TOP) | DT_NOCLIP | DT_SINGLELINE;1086 INT format = BUTTON_GetTextFormat(dwStyle,GetWindowLongA(hwnd,GWL_EXSTYLE),DT_LEFT,DT_TOP) | DT_NOCLIP | DT_SINGLELINE; 1087 1087 1088 1088 textLen++; -
trunk/src/user32/edit.cpp
r2469 r2666 1 /* $Id: edit.cpp,v 1.3 1 2000-01-18 20:10:35 sandervlExp $ */1 /* $Id: edit.cpp,v 1.32 2000-02-05 19:45:15 cbratschi Exp $ */ 2 2 /* 3 3 * Edit control … … 3777 3777 } 3778 3778 3779 //CB: original control sredraws many times, cache drawing3779 //CB: original control redraws many times, cache drawing 3780 3780 HideCaret(hwnd); 3781 3781 GetClientRect(hwnd,&rect); -
trunk/src/user32/oslibwin.cpp
r2657 r2666 1 /* $Id: oslibwin.cpp,v 1.6 6 2000-02-05 14:08:53 sandervlExp $ */1 /* $Id: oslibwin.cpp,v 1.67 2000-02-05 19:45:16 cbratschi Exp $ */ 2 2 /* 3 3 * Window API wrappers for OS/2 … … 51 51 HWND OSLibWinCreateWindow(HWND hwndParent,ULONG dwWinStyle, 52 52 char *pszName, HWND Owner, ULONG fHWND_BOTTOM, HWND *hwndFrame, 53 ULONG id, BOOL fTaskList,BOOL saveBits)53 ULONG id, BOOL fTaskList,BOOL fShellPosition,BOOL saveBits) 54 54 { 55 55 HWND hwndClient; … … 81 81 dwFrameStyle |= FCF_TASKLIST | FCF_NOMOVEWITHOWNER; 82 82 } 83 if (fShellPosition) dwFrameStyle |= FCF_SHELLPOSITION; 83 84 84 85 dwWinStyle &= ~WS_CLIPCHILDREN; … … 102 103 //****************************************************************************** 103 104 //****************************************************************************** 104 BOOL OSLibWinConvertStyle(ULONG dwStyle, ULONG *dwExStyle, ULONG *OSWinStyle)105 BOOL OSLibWinConvertStyle(ULONG dwStyle, ULONG dwExStyle, ULONG *OSWinStyle) 105 106 { 106 107 *OSWinStyle = 0; … … 912 913 ULONG dwWinStyle; 913 914 914 OSLibWinConvertStyle(dwStyle, &dwExStyle, &dwWinStyle);915 OSLibWinConvertStyle(dwStyle, dwExStyle, &dwWinStyle); 915 916 916 917 dwWinStyle = dwWinStyle & ~(WS_TABSTOP | WS_GROUP | WS_CLIPCHILDREN); -
trunk/src/user32/oslibwin.h
r2657 r2666 1 /* $Id: oslibwin.h,v 1.3 7 2000-02-05 14:08:53 sandervlExp $ */1 /* $Id: oslibwin.h,v 1.38 2000-02-05 19:45:16 cbratschi Exp $ */ 2 2 /* 3 3 * Window API wrappers for OS/2 … … 40 40 HWND OSLibWinCreateWindow(HWND hwndParent,ULONG dwWinStyle, 41 41 char *pszName, HWND Owner, ULONG fBottom, 42 HWND *hwndFrame, ULONG id, BOOL fTaskList,BOOL saveBits);43 44 BOOL OSLibWinConvertStyle(ULONG dwStyle, ULONG *dwExStyle, ULONG *OSWinStyle);45 void OSLibSetWindowStyle(HWND hwnd, ULONG dwStyle, ULONG dwExStyle, BOOL saveBits);42 HWND *hwndFrame, ULONG id, BOOL fTaskList,BOOL fShellPosition,BOOL saveBits); 43 44 BOOL OSLibWinConvertStyle(ULONG dwStyle, ULONG dwExStyle, ULONG *OSWinStyle); 45 void OSLibSetWindowStyle(HWND hwnd, ULONG dwStyle, BOOL fTaskList); 46 46 47 47 #define OSLIB_QWL_USER -4 -
trunk/src/user32/user32.rc
r2470 r2666 1 /* $Id: user32.rc,v 1. 7 2000-01-18 20:16:51 sandervlExp $ */1 /* $Id: user32.rc,v 1.8 2000-02-05 19:45:17 cbratschi Exp $ */ 2 2 /* converted from WINE */ 3 3 … … 30 30 OBM_CLOSED BITMAP LOADONCALL DISCARDABLE 31 31 { 32 33 34 35 36 37 38 39 40 41 42 43 44 32 '42 4D C8 00 00 00 00 00 00 00 1A 00 00 00 0C 00' 33 '00 00 10 00 0E 00 01 00 04 00 BF BF BF 00 00 00' 34 'FF FF FF D8 D8 D8 7F 7F 7F 00 00 00 00 00 00 00' 35 '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' 36 '00 00 00 00 00 00 00 00 00 00 22 22 22 22 22 22' 37 '22 22 13 33 33 33 33 33 33 32 14 00 00 00 00 00' 38 '00 32 14 00 01 10 00 01 10 32 14 00 00 11 00 11' 39 '00 32 14 00 00 01 11 10 00 32 14 00 00 00 11 00' 40 '00 32 14 00 00 01 11 10 00 32 14 00 00 11 00 11' 41 '00 32 14 00 01 10 00 01 10 32 14 00 00 00 00 00' 42 '00 32 14 00 00 00 00 00 00 32 14 44 44 44 44 44' 43 '44 32 11 11 11 11 11 11 11 12 44 44 44 44 44 32' 44 '11 11 11 11 11 11 11 12' 45 45 } 46 46 … … 54 54 OBM_RESTORED BITMAP LOADONCALL DISCARDABLE 55 55 { 56 57 58 59 60 61 62 63 64 65 66 67 68 56 '42 4D C8 00 00 00 00 00 00 00 1A 00 00 00 0C 00' 57 '00 00 10 00 0E 00 01 00 04 00 BF BF BF 00 00 00' 58 'FF FF FF D8 D8 D8 7F 7F 7F 00 00 00 00 00 00 00' 59 '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' 60 '00 00 00 00 00 00 00 00 00 00 22 22 22 22 22 22' 61 '22 22 13 33 33 33 33 33 33 32 14 00 11 11 11 00' 62 '00 32 14 00 10 00 01 00 00 32 14 00 10 00 01 00' 63 '00 32 14 00 10 00 01 11 00 32 14 00 11 11 11 01' 64 '00 32 14 00 11 11 11 01 00 32 14 00 00 10 00 01' 65 '00 32 14 00 00 11 11 11 00 32 14 00 00 11 11 11' 66 '00 32 14 00 00 00 00 00 00 32 14 44 44 44 44 44' 67 '44 32 11 11 11 11 11 11 11 12 44 44 44 44 44 32' 68 '11 11 11 11 11 11 11 12' 69 69 } 70 70 71 71 OBM_ZOOMD BITMAP LOADONCALL DISCARDABLE 72 72 { 73 74 75 76 77 78 79 80 81 82 83 84 85 73 '42 4D C8 00 00 00 00 00 00 00 1A 00 00 00 0C 00' 74 '00 00 10 00 0E 00 01 00 04 00 BF BF BF 00 00 00' 75 'FF FF FF D8 D8 D8 7F 7F 7F 00 00 00 00 00 00 00' 76 '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' 77 '00 00 00 00 00 00 00 00 00 00 22 22 22 22 22 22' 78 '22 22 13 33 33 33 33 33 33 32 14 00 11 11 11 11' 79 '10 32 14 00 10 00 00 00 10 32 14 00 10 00 00 00' 80 '10 32 14 00 10 00 00 00 10 32 14 00 10 00 00 00' 81 '10 32 14 00 10 00 00 00 10 32 14 00 10 00 00 00' 82 '10 32 14 00 11 11 11 11 10 32 14 00 11 11 11 11' 83 '10 32 14 00 00 00 00 00 00 32 14 44 44 44 44 44' 84 '44 32 11 11 11 11 11 11 11 11 44 44 44 44 44 32' 85 '11 11 11 11 11 11 11 11' 86 86 } 87 87 88 88 OBM_REDUCED BITMAP LOADONCALL DISCARDABLE 89 89 { 90 91 92 93 94 95 96 97 98 99 100 101 102 90 '42 4D C8 00 00 00 00 00 00 00 1A 00 00 00 0C 00' 91 '00 00 10 00 0E 00 01 00 04 00 BF BF BF 00 00 00' 92 'FF FF FF D8 D8 D8 7F 7F 7F 00 00 00 00 00 00 00' 93 '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' 94 '00 00 00 00 00 00 00 00 00 00 22 22 22 22 22 22' 95 '22 22 13 33 33 33 33 33 33 32 14 00 01 11 11 10' 96 '00 32 14 00 01 11 11 10 00 32 14 00 00 00 00 00' 97 '00 32 14 00 00 00 00 00 00 32 14 00 00 00 00 00' 98 '00 32 14 00 00 00 00 00 00 32 14 00 00 00 00 00' 99 '00 32 14 00 00 00 00 00 00 32 14 00 00 00 00 00' 100 '00 32 14 00 00 00 00 00 00 32 14 44 44 44 44 44' 101 '44 32 11 11 11 11 11 11 11 11 44 44 44 44 44 32' 102 '11 11 11 11 11 11 11 11' 103 103 } 104 104 105 105 OBM_RESTORE BITMAP LOADONCALL DISCARDABLE 106 106 { 107 108 109 110 111 112 113 114 115 116 117 118 119 107 '42 4D C8 00 00 00 00 00 00 00 1A 00 00 00 0C 00' 108 '00 00 10 00 0E 00 01 00 04 00 BF BF BF 00 00 00' 109 'FF FF FF 7F 7F 7F D8 D8 D8 00 00 00 00 00 00 00' 110 '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' 111 '00 00 00 00 00 00 00 00 00 00 11 11 11 11 11 11' 112 '11 11 23 33 33 33 33 33 33 31 24 00 00 00 00 00' 113 '00 31 24 01 11 11 10 00 00 31 24 01 00 00 10 00' 114 '00 31 24 01 00 00 10 00 00 31 24 01 00 00 11 10' 115 '00 31 24 01 11 11 10 10 00 31 24 01 11 11 10 10' 116 '00 31 24 00 01 00 00 10 00 31 24 00 01 11 11 10' 117 '00 31 24 00 01 11 11 10 00 31 24 44 44 44 44 44' 118 '44 31 22 22 22 22 22 22 22 21 44 44 44 44 44 31' 119 '22 22 22 22 22 22 22 21' 120 120 } 121 121 122 122 OBM_ZOOM BITMAP LOADONCALL DISCARDABLE 123 123 { 124 125 126 127 128 129 130 131 132 133 134 135 136 124 '42 4D C8 00 00 00 00 00 00 00 1A 00 00 00 0C 00' 125 '00 00 10 00 0E 00 01 00 04 00 BF BF BF 00 00 00' 126 'FF FF FF 7F 7F 7F D8 D8 D8 00 00 00 00 00 00 00' 127 '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' 128 '00 00 00 00 00 00 00 00 00 00 11 11 11 11 11 11' 129 '11 11 23 33 33 33 33 33 33 31 24 00 00 00 00 00' 130 '00 31 24 01 11 11 11 11 00 31 24 01 00 00 00 01' 131 '00 31 24 01 00 00 00 01 00 31 24 01 00 00 00 01' 132 '00 31 24 01 00 00 00 01 00 31 24 01 00 00 00 01' 133 '00 31 24 01 00 00 00 01 00 31 24 01 11 11 11 11' 134 '00 31 24 01 11 11 11 11 00 31 24 44 44 44 44 44' 135 '44 31 22 22 22 22 22 22 22 21 44 44 44 44 44 31' 136 '22 22 22 22 22 22 22 21' 137 137 } 138 138 139 139 OBM_REDUCE BITMAP LOADONCALL DISCARDABLE 140 140 { 141 142 143 144 145 146 147 148 149 150 151 152 153 141 '42 4D C8 00 00 00 00 00 00 00 1A 00 00 00 0C 00' 142 '00 00 10 00 0E 00 01 00 04 00 BF BF BF 00 00 00' 143 'FF FF FF 7F 7F 7F D8 D8 D8 00 00 00 00 00 00 00' 144 '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' 145 '00 00 00 00 00 00 00 00 00 00 11 11 11 11 11 11' 146 '11 11 23 33 33 33 33 33 33 31 24 00 00 00 00 00' 147 '00 31 24 00 11 11 11 00 00 31 24 00 11 11 11 00' 148 '00 31 24 00 00 00 00 00 00 31 24 00 00 00 00 00' 149 '00 31 24 00 00 00 00 00 00 31 24 00 00 00 00 00' 150 '00 31 24 00 00 00 00 00 00 31 24 00 00 00 00 00' 151 '00 31 24 00 00 00 00 00 00 31 24 44 44 44 44 44' 152 '44 31 22 22 22 22 22 22 22 21 44 44 44 44 44 31' 153 '22 22 22 22 22 22 22 21' 154 154 } 155 155 … … 158 158 OBM_CLOSE BITMAP LOADONCALL DISCARDABLE 159 159 { 160 161 162 163 164 165 166 167 168 169 170 171 172 160 '42 4D C8 00 00 00 00 00 00 00 1A 00 00 00 0C 00' 161 '00 00 10 00 0E 00 01 00 04 00 BF BF BF 00 00 00' 162 'FF FF FF 7F 7F 7F D8 D8 D8 00 00 00 00 00 00 00' 163 '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' 164 '00 00 00 00 00 00 00 00 00 00 11 11 11 11 11 11' 165 '11 11 23 33 33 33 33 33 33 31 24 00 00 00 00 00' 166 '00 31 24 00 00 00 00 00 00 31 24 00 11 00 00 11' 167 '00 31 24 00 01 10 01 10 00 31 24 00 00 11 11 00' 168 '00 31 24 00 00 01 10 00 00 31 24 00 00 11 11 00' 169 '00 31 24 00 01 10 01 10 00 31 24 00 11 00 00 11' 170 '00 31 24 00 00 00 00 00 00 31 24 44 44 44 44 44' 171 '44 31 22 22 22 22 22 22 22 21 44 44 44 44 44 31' 172 '22 22 22 22 22 22 22 21' 173 173 } 174 174 … … 179 179 OBM_OLD_RESTORE BITMAP LOADONCALL DISCARDABLE 180 180 { 181 182 183 184 185 186 187 188 181 '42 4D 7A 00 00 00 00 00 00 00 1A 00 00 00 0C 00' 182 '00 00 19 00 13 00 01 00 01 00 FF FF FF 00 00 00' 183 '00 00 00 00 00 00 00 00 00 81 F0 00 01 C3 F0 00' 184 '02 E2 30 00 04 72 30 00 08 3A 30 00 10 1E 30 00' 185 '3C 7E 30 00 04 62 30 00 04 62 3C 00 04 7E 3E 00' 186 '04 68 0C 00 04 64 18 00 04 62 30 00 04 61 60 00' 187 '07 C0 80 00 00 00 00 00 00 00 00 00 60 00 07 C0' 188 '80 00 00 00 00 00 00 00 00 00' 189 189 } 190 190 191 191 OBM_OLD_ZOOM BITMAP LOADONCALL DISCARDABLE 192 192 { 193 194 195 196 197 198 199 200 193 '42 4D 7A 00 00 00 00 00 00 00 1A 00 00 00 0C 00' 194 '00 00 19 00 13 00 01 00 01 00 FF FF FF 00 00 00' 195 '00 00 00 00 00 00 00 00 00 1F 00 00 00 3F 00 00' 196 '00 23 00 00 00 23 00 00 00 23 00 00 00 23 00 00' 197 '00 23 00 00 00 23 00 00 00 23 C0 00 01 E3 E0 00' 198 '00 80 C0 00 00 41 80 00 00 23 00 00 00 16 00 00' 199 '00 08 00 00 00 00 00 00 00 00 00 00 00 00 00 08' 200 '00 00 00 00 00 00 00 00 00 00' 201 201 } 202 202 203 203 OBM_OLD_REDUCE BITMAP LOADONCALL DISCARDABLE 204 204 { 205 206 207 208 209 210 211 212 205 '42 4D 7A 00 00 00 00 00 00 00 1A 00 00 00 0C 00' 206 '00 00 19 00 13 00 01 00 01 00 FF FF FF 00 00 00' 207 '00 00 00 00 00 04 00 00 00 0E 00 00 00 17 00 00' 208 '00 23 80 00 00 41 C0 00 00 80 E0 00 01 E3 C0 00' 209 '00 23 00 00 00 23 00 00 00 23 00 00 00 23 00 00' 210 '00 23 00 00 00 23 00 00 00 22 00 00 00 3E 00 00' 211 '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' 212 '00 00 00 00 00 00 00 00 00 00' 213 213 } 214 214 … … 218 218 OBM_SIZE BITMAP LOADONCALL DISCARDABLE 219 219 { 220 221 222 223 224 225 226 220 '42 4D 62 00 00 00 00 00 00 00 1A 00 00 00 0C 00' 221 '00 00 0D 00 0D 00 01 00 01 00 FF FF FF 00 00 00' 222 '07 00 00 00 07 00 00 00 07 00 00 00 07 00 00 00' 223 '07 00 00 00 FF 00 00 00 FF 00 00 00 00 00 00 00' 224 '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' 225 '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' 226 '00 00' 227 227 } 228 228 229 229 OBM_OLD_CLOSE BITMAP LOADONCALL DISCARDABLE 230 230 { 231 232 233 234 235 236 237 238 239 240 241 242 243 231 '42 4D C6 00 00 00 00 00 00 00 1A 00 00 00 0C 00' 232 '00 00 32 00 13 00 01 00 01 00 FF FF FF 00 00 00' 233 '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' 234 '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' 235 '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' 236 '00 00 00 00 00 00 00 00 1F FF FE 00 3F F0 00 00' 237 '3F FF FE 00 7F F0 00 00 20 00 06 00 40 30 00 00' 238 '20 00 06 00 40 30 00 00 3F FF FC 00 7F E0 00 00' 239 '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' 240 '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' 241 '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' 242 '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' 243 '00 00 00 00 00 00' 244 244 } 245 245 … … 253 253 OBM_BTNCORNERS BITMAP LOADONCALL DISCARDABLE 254 254 { 255 256 257 258 259 260 255 '42 4D 56 00 00 00 00 00 00 00 1A 00 00 00 0C 00' 256 '00 00 1E 00 0A 00 01 00 01 00 FF FF FF 00 00 00' 257 '00 00 00 00 00 07 80 00 1E 0F C0 00 21 18 61 E0' 258 '21 18 61 E0 21 18 61 E0 21 18 61 E0 1E 0F C0 00' 259 '00 07 80 00 00 00 00 00 61 E0 1E 0F C0 00 00 07' 260 '80 00 00 00 00 00' 261 261 } 262 262 … … 291 291 OBM_CHECK BITMAP LOADONCALL DISCARDABLE 292 292 { 293 294 295 296 297 298 299 293 '42 4D 66 00 00 00 00 00 00 00 1A 00 00 00 0C 00' 294 '00 00 0E 00 0E 00 01 00 01 00 FF FF FF 00 00 00' 295 '00 00 00 00 00 00 00 00 00 00 00 00 01 00 00 00' 296 '03 80 00 00 02 80 00 00 06 C0 00 00 0C 40 00 00' 297 '00 60 00 00 00 20 00 00 00 30 00 00 00 10 00 00' 298 '00 10 00 00 00 00 00 00 00 00 00 10 00 00 00 10' 299 '00 00 00 00 00 00' 300 300 } 301 301 302 302 OBM_BTSIZE BITMAP LOADONCALL DISCARDABLE 303 303 { 304 305 306 307 308 309 310 304 '42 4D 6A 00 00 00 00 00 00 00 1A 00 00 00 0C 00' 305 '00 00 0F 00 0F 00 01 00 01 00 FF FF FF 00 00 00' 306 'FF FE 00 00 80 02 00 00 80 02 00 00 80 02 00 00' 307 '80 02 00 00 80 02 00 00 FF 82 00 00 80 82 00 00' 308 '80 82 00 00 80 82 00 00 80 82 00 00 80 82 00 00' 309 '80 82 00 00 80 82 00 00 FF FE 00 00 00 00 80 82' 310 '00 00 80 82 00 00 FF FE 00 00' 311 311 } 312 312 … … 315 315 OBM_RADIOCHECK BITMAP LOADONCALL DISCARDABLE 316 316 { 317 318 319 320 321 322 323 324 325 317 '42 4D 84 00 00 00 00 00 00 00 3E 00 00 00 28 00' 318 '00 00 0E 00 00 00 0E 00 00 00 01 00 01 00 00 00' 319 '00 00 38 00 00 00 00 00 00 00 00 00 00 00 02 00' 320 '00 00 00 00 00 00 FF FF FF 00 00 00 00 00 00 00' 321 '00 00 00 00 00 00 00 00 00 00 07 80 00 00 0F C0' 322 '00 00 1F E0 00 00 1F E0 00 00 1F E0 00 00 1F E0' 323 '00 00 0F C0 00 00 07 80 00 00 00 00 00 00 00 00' 324 '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' 325 '00 00 00 00' 326 326 } 327 327 … … 647 647 OBM_MNARROW BITMAP LOADONCALL DISCARDABLE 648 648 { 649 650 651 652 653 654 655 656 649 '42 4D 78 00 00 00 00 00 00 00 3E 00 00 00 28 00' 650 '00 00 07 00 00 00 0B 00 00 00 01 00 01 00 00 00' 651 '00 00 2C 00 00 00 00 00 00 00 00 00 00 00 02 00' 652 '00 00 00 00 00 00 FF FF FF 00 00 00 00 00 00 00' 653 '00 00 40 00 00 00 60 00 00 00 70 00 00 00 78 00' 654 '00 00 7C 00 00 00 78 00 00 00 70 00 00 00 60 00' 655 '00 00 40 00 00 00 00 00 00 00 00 00 60 00 00 00' 656 '40 00 00 00 00 00 00 00' 657 657 } 658 658 … … 664 664 OBM_OLD_LFARROW BITMAP LOADONCALL DISCARDABLE 665 665 { 666 667 668 669 670 671 672 666 '42 4D 6A 00 00 00 00 00 00 00 1A 00 00 00 0C 00' 667 '00 00 0F 00 0F 00 01 00 01 00 FF FF FF 00 00 00' 668 '00 00 00 00 00 00 00 00 00 00 00 00 01 00 00 00' 669 '03 00 00 00 07 00 00 00 0F F0 00 00 1F F0 00 00' 670 '0F F0 00 00 07 00 00 00 03 00 00 00 01 00 00 00' 671 '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' 672 '00 00 00 00 00 00 00 00 00 00' 673 673 } 674 674 675 675 OBM_OLD_RGARROW BITMAP LOADONCALL DISCARDABLE 676 676 { 677 678 679 680 681 682 683 677 '42 4D 6A 00 00 00 00 00 00 00 1A 00 00 00 0C 00' 678 '00 00 0F 00 0F 00 01 00 01 00 FF FF FF 00 00 00' 679 '00 00 00 00 00 00 00 00 00 00 00 00 01 00 00 00' 680 '01 80 00 00 01 C0 00 00 1F E0 00 00 1F F0 00 00' 681 '1F E0 00 00 01 C0 00 00 01 80 00 00 01 00 00 00' 682 '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' 683 '00 00 00 00 00 00 00 00 00 00' 684 684 } 685 685 686 686 OBM_OLD_DNARROW BITMAP LOADONCALL DISCARDABLE 687 687 { 688 689 690 691 692 693 694 688 '42 4D 6A 00 00 00 00 00 00 00 1A 00 00 00 0C 00' 689 '00 00 0F 00 0F 00 01 00 01 00 FF FF FF 00 00 00' 690 '00 00 00 00 00 00 00 00 00 00 00 00 01 00 00 00' 691 '03 80 00 00 07 C0 00 00 0F E0 00 00 1F F0 00 00' 692 '03 80 00 00 03 80 00 00 03 80 00 00 03 80 00 00' 693 '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' 694 '00 00 00 00 00 00 00 00 00 00' 695 695 } 696 696 697 697 OBM_OLD_UPARROW BITMAP LOADONCALL DISCARDABLE 698 698 { 699 700 701 702 703 704 705 699 '42 4D 6A 00 00 00 00 00 00 00 1A 00 00 00 0C 00' 700 '00 00 0F 00 0F 00 01 00 01 00 FF FF FF 00 00 00' 701 '00 00 00 00 00 00 00 00 00 00 00 00 03 80 00 00' 702 '03 80 00 00 03 80 00 00 03 80 00 00 1F F0 00 00' 703 '0F E0 00 00 07 C0 00 00 03 80 00 00 01 00 00 00' 704 '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' 705 '00 00 00 00 00 00 00 00 00 00' 706 706 } 707 707 … … 727 727 OBM_TRTYPE BITMAP LOADONCALL DISCARDABLE 728 728 { 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 729 '42 4D E6 00 00 00 00 00 00 00 76 00 00 00 28 00' 730 '00 00 0E 00 00 00 0E 00 00 00 01 00 04 00 00 00' 731 '00 00 70 00 00 00 00 00 00 00 00 00 00 00 10 00' 732 '00 00 00 00 00 00 00 00 00 00 80 00 00 00 00 80' 733 '00 00 80 80 00 00 00 00 80 00 80 00 80 00 00 80' 734 '80 00 C0 C0 C0 00 80 80 80 00 FF 00 00 00 00 FF' 735 '00 00 FF FF 00 00 00 00 FF 00 FF 00 FF 00 00 FF' 736 'FF 00 FF FF FF 00 FF FF FF FF FF FF FF 00 FF FF' 737 'FF 00 00 00 FF 00 FF FF FF FF 00 FF FF 00 FF FF' 738 'FF FF 00 FF FF 00 F8 88 88 88 00 FF FF 00 FF FF' 739 '88 FF 00 FF FF 00 FF FF 80 FF 00 FF 0F 00 FF FF' 740 '80 FF 00 FF 0F 00 FF FF 80 0F 00 F0 0F 00 F8 FF' 741 '80 00 00 00 0F 00 F8 FF 88 FF 8F FF FF 00 F8 8F' 742 '88 F8 8F FF FF 00 F8 88 88 88 8F FF FF 00 FF FF' 743 'FF FF FF FF FF 00' 744 744 } 745 745 … … 787 787 /* Cursors */ 788 788 789 #define OCR_BUMMER 790 #define OCR_DRAGOBJECT 789 #define OCR_BUMMER 100 790 #define OCR_DRAGOBJECT 101 791 791 792 792 #define OCR_NORMAL 32512 793 794 #if 0 795 796 /* CB: test: problems: flickering, PMView export bugs (transparency, hotspot, colors) */ 797 /* CB: how can we convert those X-icons/cursors? */ 798 /* please inform me about any solution: cbratschi@datacomm.ch */ 799 800 OCR_NORMAL CURSOR LOADONCALL DISCARDABLE 801 { 802 '00 00 02 00 01 00 20 20 02 00 01 00 01 00 30 01' 803 '00 00 16 00 00 00 28 00 00 00 20 00 00 00 40 00' 804 '00 00 01 00 01 00 00 00 00 00 00 02 00 00 00 00' 805 '00 00 00 00 00 00 02 00 00 00 00 00 00 00 00 00' 806 '00 00 FF FF FF 00 00 00 00 00 00 00 00 00 00 00' 807 '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' 808 '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' 809 '00 00 00 00 00 00 00 00 00 00 00 C0 00 00 00 C0' 810 '00 00 01 80 00 00 01 80 00 00 03 00 00 00 43 00' 811 '00 00 66 00 00 00 76 00 00 00 7E 00 00 00 7F C0' 812 '00 00 7F 80 00 00 7F 00 00 00 7E 00 00 00 7C 00' 813 '00 00 78 00 00 00 70 00 00 00 60 00 00 00 40 00' 814 '00 00 00 00 00 00 FF FF FF FF FF FF FF FF FF FF' 815 'FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF' 816 'FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF' 817 'FF FF FF FF FF FF FF FF FF FF FF 3F FF FF FF 3F' 818 'FF FF FE 7F FF FF FE 7F FF FF FC FF FF FF BC FF' 819 'FF FF 99 FF FF FF 89 FF FF FF 81 FF FF FF 80 3F' 820 'FF FF 80 7F FF FF 80 FF FF FF 81 FF FF FF 83 FF' 821 'FF FF 87 FF FF FF 8F FF FF FF 9F FF FF FF BF FF' 822 'FF FF FF FF FF FF' 823 } 824 825 #endif 826 793 827 #define OCR_IBEAM 32513 794 828 #define OCR_WAIT 32514 … … 846 880 VALUE "FileVersion", "4.00\0" 847 881 VALUE "InternalName", "USER32\0" 848 VALUE "LegalCopyright", "Copyright (C) 1999 \0"882 VALUE "LegalCopyright", "Copyright (C) 1999-2000\0" 849 883 VALUE "LegalTrademarks", "\0" 850 884 VALUE "OriginalFilename", "USER32.DLL\0" -
trunk/src/user32/win32wbase.cpp
r2663 r2666 1 /* $Id: win32wbase.cpp,v 1.15 3 2000-02-05 16:24:59 sandervlExp $ */1 /* $Id: win32wbase.cpp,v 1.154 2000-02-05 19:45:17 cbratschi Exp $ */ 2 2 /* 3 3 * Win32 Window Base Class for OS/2 … … 124 124 userData = 0; 125 125 contextHelpId = 0; 126 hotkey = 0; 126 127 127 128 pOldFrameProc = NULL; … … 236 237 char buffer[256]; 237 238 POINT maxSize, maxPos, minTrack, maxTrack; 239 BOOL xDefault = FALSE,cxDefault = FALSE; 238 240 239 241 #ifdef DEBUG … … 308 310 if ((cs->x == CW_USEDEFAULT) || (cs->x == CW_USEDEFAULT16)) 309 311 { 310 // PDB *pdb = PROCESS_Current();311 312 312 /* Never believe Microsoft's documentation... CreateWindowEx doc says 313 313 * that if an overlapped window is created with WS_VISIBLE style bit … … 329 329 330 330 /* We have saved cs->y, now we can trash it */ 331 #if 0 332 if ( !(cs->style & (WS_CHILD | WS_POPUP)) 333 && (pdb->env_db->startup_info->dwFlags & STARTF_USEPOSITION) ) 334 { 335 cs->x = pdb->env_db->startup_info->dwX; 336 cs->y = pdb->env_db->startup_info->dwY; 337 } 338 #endif 339 cs->x = 0; 340 cs->y = 0; 341 // } 331 cs->x = 0; 332 cs->y = 0; 333 xDefault = TRUE; 342 334 } 343 335 if ((cs->cx == CW_USEDEFAULT) || (cs->cx == CW_USEDEFAULT16)) 344 336 { 345 #if 0 346 PDB *pdb = PROCESS_Current(); 347 if ( !(cs->style & (WS_CHILD | WS_POPUP)) 348 && (pdb->env_db->startup_info->dwFlags & STARTF_USESIZE) ) 349 { 350 cs->cx = pdb->env_db->startup_info->dwXSize; 351 cs->cy = pdb->env_db->startup_info->dwYSize; 352 } 353 else 354 { 355 #endif 356 cs->cx = 600; /* FIXME */ 357 cs->cy = 400; 358 // } 337 cs->cx = 600; /* FIXME */ 338 cs->cy = 400; 339 cxDefault = TRUE; 359 340 } 360 341 … … 459 440 vertScrollInfo->MaxVal = 100; 460 441 vertScrollInfo->flags = ESB_ENABLE_BOTH; 442 } 443 444 if(HIWORD(cs->lpszName)) 445 { 446 if (!isUnicode) 447 { 448 wndNameLength = strlen(cs->lpszName); 449 windowNameA = (LPSTR)_smalloc(wndNameLength+1); 450 strcpy(windowNameA,cs->lpszName); 451 windowNameW = (LPWSTR)_smalloc((wndNameLength+1)*sizeof(WCHAR)); 452 lstrcpyAtoW(windowNameW,windowNameA); 453 windowNameA[wndNameLength] = 0; 454 windowNameW[wndNameLength] = 0; 455 } 456 else 457 { 458 wndNameLength = lstrlenW((LPWSTR)cs->lpszName); 459 windowNameA = (LPSTR)_smalloc(wndNameLength+1); 460 lstrcpyWtoA(windowNameA,(LPWSTR)cs->lpszName); 461 windowNameW = (LPWSTR)_smalloc((wndNameLength+1)*sizeof(WCHAR)); 462 lstrcpyW(windowNameW,(LPWSTR)cs->lpszName); 463 windowNameA[wndNameLength] = 0; 464 windowNameW[wndNameLength] = 0; 465 } 466 } 467 468 //copy pointer of CREATESTRUCT for usage in MsgCreate method 469 tmpcs = cs; 470 471 //Store our window object pointer in thread local memory, so PMWINDOW.CPP can retrieve it 472 THDB *thdb = GetThreadTHDB(); 473 474 if(thdb == NULL) { 475 dprintf(("Window creation failed - thdb == NULL")); //this is VERY bad 476 ExitProcess(666); 477 return FALSE; 478 } 479 480 thdb->newWindow = (ULONG)this; 481 482 DWORD dwOSWinStyle; 483 484 OSLibWinConvertStyle(dwStyle,dwExStyle,&dwOSWinStyle); 485 if (((dwStyle & (WS_CAPTION | WS_SYSMENU | 0xC0000000)) == (WS_CAPTION | WS_SYSMENU))) fTaskList = TRUE; 486 487 OS2Hwnd = OSLibWinCreateWindow((getParent()) ? getParent()->getOS2WindowHandle() : OSLIB_HWND_DESKTOP, 488 dwOSWinStyle,(char *)windowNameA, 489 (owner) ? owner->getOS2WindowHandle() : OSLIB_HWND_DESKTOP, 490 (hwndLinkAfter == HWND_BOTTOM) ? TRUE : FALSE, 491 &OS2HwndFrame, 0, fTaskList,xDefault | cxDefault,windowClass->getStyle() & CS_SAVEBITS); 492 if(OS2Hwnd == 0) { 493 dprintf(("Window creation failed!!")); 494 SetLastError(ERROR_OUTOFMEMORY); //TODO: Better error 495 return FALSE; 496 } 497 498 //adjust CW_USEDEFAULT position 499 if (xDefault | cxDefault) 500 { 501 RECT rect; 502 503 OSLibWinQueryWindowRect(OS2HwndFrame,&rect,RELATIVE_TO_SCREEN); 504 if (getParent()) mapWin32Rect(OSLIB_HWND_DESKTOP,getParent()->getOS2FrameWindowHandle(),&rect); 505 if (xDefault) 506 { 507 cs->x = rect.left; 508 cs->y = rect.top; 509 } 510 if (cxDefault) 511 { 512 cs->cx = rect.right-rect.left; 513 cs->cy = rect.bottom-rect.top; 514 } 461 515 } 462 516 … … 480 534 if (cs->cx <= 0) cs->cx = 1; 481 535 if (cs->cy <= 0) cs->cy = 1; 482 }483 484 if(((dwStyle & 0xC0000000) == WS_OVERLAPPED) && ((dwStyle & WS_CAPTION) == WS_CAPTION) && owner == NULL485 && dwStyle & WS_SYSMENU)486 {487 fTaskList = TRUE;488 }489 490 DWORD dwOSWinStyle;491 492 OSLibWinConvertStyle(dwStyle, &dwExStyle, &dwOSWinStyle);493 494 if(HIWORD(cs->lpszName))495 {496 if (!isUnicode)497 {498 wndNameLength = strlen(cs->lpszName);499 windowNameA = (LPSTR)_smalloc(wndNameLength+1);500 strcpy(windowNameA,cs->lpszName);501 windowNameW = (LPWSTR)_smalloc((wndNameLength+1)*sizeof(WCHAR));502 lstrcpyAtoW(windowNameW,windowNameA);503 windowNameA[wndNameLength] = 0;504 windowNameW[wndNameLength] = 0;505 }506 else507 {508 wndNameLength = lstrlenW((LPWSTR)cs->lpszName);509 windowNameA = (LPSTR)_smalloc(wndNameLength+1);510 lstrcpyWtoA(windowNameA,(LPWSTR)cs->lpszName);511 windowNameW = (LPWSTR)_smalloc((wndNameLength+1)*sizeof(WCHAR));512 lstrcpyW(windowNameW,(LPWSTR)cs->lpszName);513 windowNameA[wndNameLength] = 0;514 windowNameW[wndNameLength] = 0;515 }516 }517 518 //copy pointer of CREATESTRUCT for usage in MsgCreate method519 tmpcs = cs;520 521 //Store our window object pointer in thread local memory, so PMWINDOW.CPP can retrieve it522 THDB *thdb = GetThreadTHDB();523 524 if(thdb == NULL) {525 dprintf(("Window creation failed - thdb == NULL")); //this is VERY bad526 ExitProcess(666);527 return FALSE;528 }529 530 thdb->newWindow = (ULONG)this;531 532 OS2Hwnd = OSLibWinCreateWindow((getParent()) ? getParent()->getOS2WindowHandle() : OSLIB_HWND_DESKTOP,533 dwOSWinStyle,(char *)windowNameA,534 (owner) ? owner->getOS2WindowHandle() : OSLIB_HWND_DESKTOP,535 (hwndLinkAfter == HWND_BOTTOM) ? TRUE : FALSE,536 &OS2HwndFrame, 0, fTaskList,windowClass->getStyle() & CS_SAVEBITS);537 if(OS2Hwnd == 0) {538 dprintf(("Window creation failed!!"));539 SetLastError(ERROR_OUTOFMEMORY); //TODO: Better error540 return FALSE;541 536 } 542 537 … … 1599 1594 } 1600 1595 1596 case WM_SETHOTKEY: 1597 hotkey = wParam; 1598 return 1; //CB: always successful 1599 1600 case WM_GETHOTKEY: 1601 return hotkey; 1602 1603 case WM_CONTEXTMENU: 1604 if ((dwStyle & WS_CHILD) && getParent()) 1605 getParent()->SendInternalMessageA(WM_CONTEXTMENU,wParam,lParam); 1606 return 0; 1607 1601 1608 case WM_SHOWWINDOW: 1602 1609 if (!lParam) return 0; /* sent from ShowWindow */ … … 1616 1623 1617 1624 case WM_QUERYDROPOBJECT: 1618 if (dwExStyle & WS_EX_ACCEPTFILES) return 1; 1619 return 0; 1625 return (dwExStyle & WS_EX_ACCEPTFILES) ? 1:0; 1620 1626 1621 1627 case WM_QUERYDRAGICON: … … 1639 1645 1640 1646 case WM_NOTIFYFORMAT: 1641 if (IsWindowUnicode()) return NFR_UNICODE; 1642 else return NFR_ANSI; 1647 return IsWindowUnicode() ? NFR_UNICODE:NFR_ANSI; 1643 1648 1644 1649 case WM_SETICON: -
trunk/src/user32/win32wbase.h
r2663 r2666 1 /* $Id: win32wbase.h,v 1.8 0 2000-02-05 16:25:00 sandervlExp $ */1 /* $Id: win32wbase.h,v 1.81 2000-02-05 19:45:19 cbratschi Exp $ */ 2 2 /* 3 3 * Win32 Window Base Class for OS/2 … … 324 324 DWORD flags; 325 325 DWORD contextHelpId; 326 DWORD hotkey; 326 327 LONG lastHitTestVal; //Last value returned by WM_NCHITTEST handler 327 328 … … 398 399 VOID DrawMaxButton(HDC hdc,RECT *rect,BOOL down,BOOL bGrayed); 399 400 VOID DrawMinButton(HDC hdc,RECT *rect,BOOL down,BOOL bGrayed); 400 VOID DrawCaption(HDC hdc,RECT *rect,BOOL active,BOOL redrawText); 401 VOID DrawHelpButton(HDC hdc,RECT *rect,BOOL down,BOOL bGrayed); 402 VOID DrawCaption(HDC hdc,RECT *rect,BOOL active); 401 403 VOID DoNCPaint(HRGN clip,BOOL suppress_menupaint); 402 404 LONG HandleNCPaint(HRGN clip); -
trunk/src/user32/win32wbasenonclient.cpp
r2611 r2666 1 /* $Id: win32wbasenonclient.cpp,v 1. 8 2000-02-03 17:13:03cbratschi Exp $ */1 /* $Id: win32wbasenonclient.cpp,v 1.9 2000-02-05 19:45:19 cbratschi Exp $ */ 2 2 /* 3 3 * Win32 Window Base Class for OS/2 (non-client methods) … … 629 629 if (!(dwStyle & DS_MODALFRAME)) 630 630 hIcon = LoadImageA(0, MAKEINTRESOURCEA(OIC_ODINICON), IMAGE_ICON, 0, 0, LR_DEFAULTCOLOR); 631 631 //CB: todo: add icons (including Odin icon) to user32.rc 632 632 if (hIcon) 633 633 DrawIconEx(hdc,r.left+2,r.top+2,hIcon, … … 780 780 } 781 781 //****************************************************************************** 782 // redrawText: only redraws text 783 //****************************************************************************** 784 VOID Win32BaseWindow::DrawCaption(HDC hdc,RECT *rect,BOOL active,BOOL redrawText) 782 //****************************************************************************** 783 VOID Win32BaseWindow::DrawHelpButton(HDC hdc,RECT *rect,BOOL down,BOOL bGrayed) 784 { 785 RECT r; 786 HDC hdcMem; 787 BITMAP bmp; 788 HBITMAP hBmp,hOldBmp; 789 790 if (!rect) GetInsideRect(&r); 791 else r = *rect; 792 #if 0 //CB: todo 793 hdcMem = CreateCompatibleDC( hdc ); 794 hBmp = down ? hbitmapMinimizeD : hbitmapMinimize; 795 hOldBmp= SelectObject( hdcMem, hBmp ); 796 GetObjectA (hBmp, sizeof(BITMAP), &bmp); 797 798 if (dwStyle & WS_SYSMENU) 799 r.right -= GetSystemMetrics(SM_CYCAPTION) + 1; 800 801 /* In win 95 there is always a Maximize box when there is a Minimize one */ 802 if ((dwStyle & WS_MAXIMIZEBOX) || (dwStyle & WS_MINIMIZEBOX)) 803 r.right -= bmp.bmWidth; 804 805 BitBlt( hdc, r.right - (GetSystemMetrics(SM_CXSIZE) + bmp.bmWidth) / 2, 806 r.top + (GetSystemMetrics(SM_CYCAPTION) - 1 - bmp.bmHeight) / 2, 807 bmp.bmWidth, bmp.bmHeight, hdcMem, 0, 0, SRCCOPY ); 808 809 if(bGrayed) 810 DrawGrayButton(hdc, r.right - (GetSystemMetrics(SM_CXSIZE) + bmp.bmWidth) / 2 + 2, 811 r.top + (GetSystemMetrics(SM_CYCAPTION) - 1 - bmp.bmHeight) / 2 + 2); 812 813 814 SelectObject (hdcMem, hOldBmp); 815 DeleteDC( hdcMem ); 816 #endif 817 } 818 //****************************************************************************** 819 //****************************************************************************** 820 VOID Win32BaseWindow::DrawCaption(HDC hdc,RECT *rect,BOOL active) 785 821 { 786 822 RECT r = *rect,r2; … … 850 886 if ((dwStyle & WS_SYSMENU) && !(dwExStyle & WS_EX_TOOLWINDOW)) 851 887 { 852 if ( redrawText ||DrawSysButton(memDC,&r))888 if (DrawSysButton(memDC,&r)) 853 889 r.left += GetSystemMetrics(SM_CYCAPTION) - 1; 854 890 } 855 891 892 //CB: todo: integrate help button 893 856 894 if (dwStyle & WS_SYSMENU) 857 895 { 858 896 UINT state; 859 897 860 if (!redrawText) 861 { 862 /* Go get the sysmenu */ 863 state = GetMenuState(hSysMenu, SC_CLOSE, MF_BYCOMMAND); 864 865 /* Draw a grayed close button if disabled and a normal one if SC_CLOSE is not there */ 866 DrawCloseButton(memDC,&r2,FALSE, 867 ((((state & MF_DISABLED) || (state & MF_GRAYED))) && (state != 0xFFFFFFFF))); 868 } 898 /* Go get the sysmenu */ 899 state = GetMenuState(hSysMenu, SC_CLOSE, MF_BYCOMMAND); 900 901 /* Draw a grayed close button if disabled and a normal one if SC_CLOSE is not there */ 902 DrawCloseButton(memDC,&r2,FALSE, 903 ((((state & MF_DISABLED) || (state & MF_GRAYED))) && (state != 0xFFFFFFFF))); 869 904 r.right -= GetSystemMetrics(SM_CYCAPTION) - 1; 870 905 … … 874 909 /* But if the menu item is not in the menu they're disabled*/ 875 910 876 if (!redrawText) 877 DrawMaxButton(memDC,&r2,FALSE,(!(dwStyle & WS_MAXIMIZEBOX))); 911 DrawMaxButton(memDC,&r2,FALSE,(!(dwStyle & WS_MAXIMIZEBOX))); 878 912 r.right -= GetSystemMetrics(SM_CXSIZE) + 1; 879 913 880 if (!redrawText) 881 DrawMinButton(memDC,&r2,FALSE, (!(dwStyle & WS_MINIMIZEBOX))); 914 DrawMinButton(memDC,&r2,FALSE, (!(dwStyle & WS_MINIMIZEBOX))); 882 915 r.right -= GetSystemMetrics(SM_CXSIZE) + 1; 883 916 } … … 974 1007 } 975 1008 if( !clip || IntersectRect( &rfuzz, &r, &rectClip ) ) 976 DrawCaption(hdc,&r,active ,FALSE);1009 DrawCaption(hdc,&r,active); 977 1010 } 978 1011
Note:
See TracChangeset
for help on using the changeset viewer.
