Changeset 164 for trunk/src/comctl32/status.c

Timestamp:

Jun 23, 1999, 9:45:02 PM (26 years ago)

Author:

achimha

Message:

updated comctl32 with the latest WINE bugfixes. Listview is much better now and tab control doesn't have the wrong color anymore. Many small improvements

File:

• trunk/src/comctl32/status.c (modified) (11 diffs)

trunk/src/comctl32/status.c

@@ -1 @@
-/* $Id: status.c,v 1.4 1999-06-16 20:25:43 cbratschi Exp $ */
+/* $Id: status.c,v 1.5 1999-06-23 19:45:01 achimha Exp $ */
 /*
  * Interface code to StatusWindow widget/control
@@ -80 +80 @@
     UINT border = BDR_SUNKENOUTER;
 
-    if (part->style==SBT_POPOUT)
+    if (part->style & SBT_POPOUT)
       border = BDR_RAISEDOUTER;
-    else if (part->style==SBT_NOBORDERS)
+    else if (part->style & SBT_NOBORDERS)
       border = 0;
 
@@ -136 +136 @@
     hOldFont = SelectObject (hdc, self->hFont ? self->hFont : self->hDefaultFont);
 
-    if (part->style == SBT_OWNERDRAW) {
+    if (part->style & SBT_OWNERDRAW) {
         DRAWITEMSTRUCT dis;
 
@@ -192 +192 @@
     else {
         for (i = 0; i < infoPtr->numParts; i++) {
-            if (infoPtr->parts[i].style == SBT_OWNERDRAW) {
+            if (infoPtr->parts[i].style & SBT_OWNERDRAW) {
                 DRAWITEMSTRUCT dis;
 
@@ -365 +365 @@
         part = &self->parts[nPart];
 
-    if (part->style == SBT_OWNERDRAW)
+    if (part->style & SBT_OWNERDRAW)
         result = (LRESULT)part->text;
     else {
@@ -391 +391 @@
         part = &infoPtr->parts[nPart];
 
-    if (part->style == SBT_OWNERDRAW)
+    if (part->style & SBT_OWNERDRAW)
         result = (LRESULT)part->text;
     else {
@@ -571 +571 @@
     if (oldNumParts > self->numParts) {
         for (i = self->numParts ; i < oldNumParts; i++) {
-            if (self->parts[i].text && (self->parts[i].style != SBT_OWNERDRAW))
+            if (self->parts[i].text && !(self->parts[i].style & SBT_OWNERDRAW))
                 COMCTL32_Free (self->parts[i].text);
         }
@@ -635 +635 @@
     STATUSWINDOWINFO *self = STATUSBAR_GetInfoPtr (hwnd);
     STATUSWINDOWPART *part;
-    int part_num;
-    int style;
+    int part_num;
+    int style;
     LPSTR text;
-    int len;
+    int len;
     HDC hdc;
 
@@ -646 +646 @@
 
     if ((self->simple) || (self->parts==NULL) || (part_num==255))
-        part = &self->part0;
+        part = &self->part0;
     else
-        part = &self->parts[part_num];
+        part = &self->parts[part_num];
     if (!part) return FALSE;
+
+    if (!(part->style & SBT_OWNERDRAW) && part->text)
+        COMCTL32_Free (part->text);
+    part->text = 0;
+
+    if (style & SBT_OWNERDRAW) {
+        part->text = (LPWSTR)text;
+    }
+    else {
+        /* duplicate string */
+        if (text && (len = lstrlenA(text))) {
+            part->text = COMCTL32_Alloc ((len+1)*sizeof(WCHAR));
+            lstrcpyAtoW (part->text, text);
+        }
+    }
     part->style = style;
-    if (style == SBT_OWNERDRAW) {
-        part->text = (LPWSTR)text;
-    }
-    else {
-        /* duplicate string */
-        if (part->text)
-            COMCTL32_Free (part->text);
-        part->text = 0;
-        if (text && (len = lstrlenA(text))) {
-            part->text = COMCTL32_Alloc ((len+1)*sizeof(WCHAR));
-            lstrcpyAtoW (part->text, text);
-        }
-    }
 
     hdc = GetDC (hwnd);
@@ -687 +689 @@
 
     if ((self->simple) || (self->parts==NULL) || (part_num==255))
-        part = &self->part0;
+        part = &self->part0;
     else
-        part = &self->parts[part_num];
+        part = &self->parts[part_num];
     if (!part) return FALSE;
+
+    if (!(part->style & SBT_OWNERDRAW) && part->text)
+        COMCTL32_Free (part->text);
+    part->text = 0;
+
+    if (style & SBT_OWNERDRAW) {
+        part->text = text;
+    }
+    else {
+        /* duplicate string */
+        if (text && (len = lstrlenW(text))) {
+            part->text = COMCTL32_Alloc ((len+1)*sizeof(WCHAR));
+            lstrcpyW(part->text, text);
+        }
+    }
     part->style = style;
-    if (style == SBT_OWNERDRAW) {
-        part->text = text;
-    }
-    else {
-        /* duplicate string */
-        if (part->text)
-            COMCTL32_Free (part->text);
-        part->text = 0;
-        if (text && (len = lstrlenW(text))) {
-            part->text = COMCTL32_Alloc ((len+1)*sizeof(WCHAR));
-            lstrcpyW(part->text, text);
-        }
-    }
 
     hdc = GetDC (hwnd);
@@ -892 +896 @@
 {
     STATUSWINDOWINFO *self = STATUSBAR_GetInfoPtr (hwnd);
-    int i;
+    int i;
 
     for (i = 0; i < self->numParts; i++) {
-        if (self->parts[i].text && (self->parts[i].style != SBT_OWNERDRAW))
-            COMCTL32_Free (self->parts[i].text);
-    }
-    if (self->part0.text && (self->part0.style != SBT_OWNERDRAW))
-        COMCTL32_Free (self->part0.text);
+        if (self->parts[i].text && !(self->parts[i].style & SBT_OWNERDRAW))
+            COMCTL32_Free (self->parts[i].text);
+    }
+    if (self->part0.text && !(self->part0.style & SBT_OWNERDRAW))
+        COMCTL32_Free (self->part0.text);
     COMCTL32_Free (self->parts);
 
     /* delete default font */
     if (self->hDefaultFont)
-        DeleteObject (self->hDefaultFont);
+        DeleteObject (self->hDefaultFont);
 
     /* delete tool tip control */
     if (self->hwndToolTip)
-        DestroyWindow (self->hwndToolTip);
+        DestroyWindow (self->hwndToolTip);
 
     COMCTL32_Free (self);