status bar: fix indentation

Dimitrie O. Paun dpaun at rogers.com
Tue Mar 1 07:37:31 CST 2005


ChangeLog
    Fix indentation for consistency with the rest of the file.


Index: dlls/comctl32/status.c
===================================================================
RCS file: /var/cvs/wine/dlls/comctl32/status.c,v
retrieving revision 1.72
diff -u -r1.72 status.c
--- dlls/comctl32/status.c	1 Mar 2005 11:44:38 -0000	1.72
+++ dlls/comctl32/status.c	1 Mar 2005 13:35:43 -0000
@@ -162,28 +162,24 @@
 
     DrawEdge(hdc, &r, border, BF_RECT|BF_ADJUST);
 
-    if (part->style & SBT_OWNERDRAW)
-	{
-	    DRAWITEMSTRUCT dis;
+    if (part->style & SBT_OWNERDRAW) {
+	DRAWITEMSTRUCT dis;
 
-	    dis.CtlID = GetWindowLongPtrW (infoPtr->Self, GWLP_ID);
-	    dis.itemID = itemID;
-	    dis.hwndItem = infoPtr->Self;
-	    dis.hDC = hdc;
-	    dis.rcItem = r;
-	    dis.itemData = (INT)part->text;
-	    SendMessageW (infoPtr->Notify, WM_DRAWITEM, (WPARAM)dis.CtlID, (LPARAM)&dis);
-    }
-    else
-	{
-	    if (part->hIcon)
-		{
-	        INT cy = r.bottom - r.top;
-
-	        r.left += 2;
-	        DrawIconEx (hdc, r.left, r.top, part->hIcon, cy, cy, 0, 0, DI_NORMAL);
-	        r.left += cy;
-		}
+	dis.CtlID = GetWindowLongPtrW (infoPtr->Self, GWLP_ID);
+	dis.itemID = itemID;
+	dis.hwndItem = infoPtr->Self;
+	dis.hDC = hdc;
+	dis.rcItem = r;
+	dis.itemData = (INT)part->text;
+	SendMessageW (infoPtr->Notify, WM_DRAWITEM, (WPARAM)dis.CtlID, (LPARAM)&dis);
+    } else {
+	if (part->hIcon) {
+	   INT cy = r.bottom - r.top;
+
+	    r.left += 2;
+	    DrawIconEx (hdc, r.left, r.top, part->hIcon, cy, cy, 0, 0, DI_NORMAL);
+	    r.left += cy;
+	}
         DrawStatusTextW (hdc, &r, part->text, SBT_NOBORDERS);
     }
 }
@@ -216,12 +212,11 @@
     if (infoPtr->clrBk != CLR_DEFAULT)
 	    DeleteObject (hbrBk);
 
-    if (GetWindowLongW (infoPtr->Self, GWL_STYLE) & SBARS_SIZEGRIP)
-	{
-	    RECT rect;
+    if (GetWindowLongW (infoPtr->Self, GWL_STYLE) & SBARS_SIZEGRIP) {
+        RECT rect;
 
-	    GetClientRect (infoPtr->Self, &rect);
-	    STATUSBAR_DrawSizeGrip (hdc, &rect);
+	GetClientRect (infoPtr->Self, &rect);
+	STATUSBAR_DrawSizeGrip (hdc, &rect);
     }
 }
 
@@ -243,19 +238,19 @@
     GetClientRect (infoPtr->Self, &rect);
 
     if (infoPtr->clrBk != CLR_DEFAULT)
-	    hbrBk = CreateSolidBrush (infoPtr->clrBk);
+	hbrBk = CreateSolidBrush (infoPtr->clrBk);
     else
-	    hbrBk = GetSysColorBrush (COLOR_3DFACE);
+	hbrBk = GetSysColorBrush (COLOR_3DFACE);
     FillRect(hdc, &rect, hbrBk);
 
     hOldFont = SelectObject (hdc, infoPtr->hFont ? infoPtr->hFont : infoPtr->hDefaultFont);
 
     if (infoPtr->simple) {
-	    STATUSBAR_RefreshPart (infoPtr, hdc, &infoPtr->part0, 0);
+	STATUSBAR_RefreshPart (infoPtr, hdc, &infoPtr->part0, 0);
     } else {
-	    for (i = 0; i < infoPtr->numParts; i++) {
-		    STATUSBAR_RefreshPart (infoPtr, hdc, &infoPtr->parts[i], i);
-	    }
+	for (i = 0; i < infoPtr->numParts; i++) {
+	    STATUSBAR_RefreshPart (infoPtr, hdc, &infoPtr->parts[i], i);
+	}
     }
 
     SelectObject (hdc, hOldFont);
@@ -582,8 +577,8 @@
 	x = parent_rect.left;
 	y = parent_rect.bottom - infoPtr->height;
 	MoveWindow (infoPtr->Self, parent_rect.left,
-		      parent_rect.bottom - infoPtr->height,
-		      width, infoPtr->height, TRUE);
+		    parent_rect.bottom - infoPtr->height,
+		    width, infoPtr->height, TRUE);
 	STATUSBAR_SetPartBounds (infoPtr);
     }
 
@@ -745,8 +740,7 @@
 	ti.uId = id;
 	ti.hinst = 0;
 	ti.lpszText = text;
-	SendMessageA (infoPtr->hwndToolTip, TTM_UPDATETIPTEXTA,
-			0, (LPARAM)&ti);
+	SendMessageA (infoPtr->hwndToolTip, TTM_UPDATETIPTEXTA, 0, (LPARAM)&ti);
     }
 
     return 0;
@@ -764,8 +758,7 @@
 	ti.uId = id;
 	ti.hinst = 0;
 	ti.lpszText = text;
-	SendMessageW (infoPtr->hwndToolTip, TTM_UPDATETIPTEXTW,
-			0, (LPARAM)&ti);
+	SendMessageW (infoPtr->hwndToolTip, TTM_UPDATETIPTEXTW, 0, (LPARAM)&ti);
     }
 
     return 0;
@@ -1089,8 +1082,7 @@
     /* Need to resize width to match parent */
     TRACE("flags %04x\n", flags);
 
-    if (flags != SIZE_RESTORED && flags != SIZE_MAXIMIZED)
-    {
+    if (flags != SIZE_RESTORED && flags != SIZE_MAXIMIZED) {
 	WARN("flags MUST be SIZE_RESTORED or SIZE_MAXIMIZED\n");
 	return FALSE;
     }

-- 
Dimi.



More information about the wine-patches mailing list