Changeset 2228 for trunk/src/user32/static.cpp
- Timestamp:
- Dec 28, 1999, 6:04:24 PM (26 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/user32/static.cpp
r2160 r2228 1 /* $Id: static.cpp,v 1.1 3 1999-12-20 16:45:16cbratschi Exp $ */1 /* $Id: static.cpp,v 1.14 1999-12-28 17:04:24 cbratschi Exp $ */ 2 2 /* 3 3 * Static control … … 123 123 if ((dwStyle & SS_TYPEMASK) != SS_BITMAP) return 0; 124 124 125 if (hBitmap && GetObjectType(hBitmap) != OBJ_BITMAP) {125 if (hBitmap && (GetObjectType(hBitmap) != OBJ_BITMAP)) { 126 126 //ERR("huh? hBitmap!=0, but not bitmap\n"); 127 127 return 0; … … 249 249 DWORD style = GetWindowLongA(hwnd,GWL_STYLE) & SS_TYPEMASK; 250 250 251 if ( style < 0L || style > SS_TYPEMASK)251 if ((style < 0L) || (style > SS_TYPEMASK)) 252 252 { 253 253 //Unknown style … … 268 268 DWORD style = GetWindowLongA(hwnd,GWL_STYLE) & SS_TYPEMASK; 269 269 270 if ( style == SS_ICON&& infoPtr->hIcon)270 if ((style == SS_ICON) && infoPtr->hIcon) 271 271 { 272 272 DestroyIcon(infoPtr->hIcon); 273 } else if ( style == SS_BITMAP&& infoPtr->hIcon)273 } else if ((style == SS_BITMAP) && infoPtr->hIcon) 274 274 { 275 275 DeleteObject(infoPtr->hIcon); 276 } else if ( style == SS_ENHMETAFILE&& infoPtr->hIcon)276 } else if ((style == SS_ENHMETAFILE) && infoPtr->hIcon) 277 277 { 278 278 DeleteEnhMetaFile((HENHMETAFILE)infoPtr->hIcon); … … 345 345 STATICINFO* infoPtr = (STATICINFO*)GetInfoPtr(hwnd); 346 346 347 if ( wParam < 4|| !lParam) return 0;347 if ((wParam < 4) || !lParam) return 0; 348 348 memcpy((VOID*)lParam,&infoPtr->hIcon,4); 349 349
Note:
See TracChangeset
for help on using the changeset viewer.