Changeset 236 for trunk/src/comctl32/toolbar.c

Timestamp:

Jun 28, 1999, 5:46:28 PM (26 years ago)

Author:

cbratschi

Message:

bug fixes (unicode) and improvements

File:

• trunk/src/comctl32/toolbar.c (modified) (9 diffs)

trunk/src/comctl32/toolbar.c

@@ -1 @@
-/* $Id: toolbar.c,v 1.6 1999-06-24 16:37:45 cbratschi Exp $ */
+/* $Id: toolbar.c,v 1.7 1999-06-28 15:46:27 cbratschi Exp $ */
 /*
  * Toolbar control
@@ -29 +29 @@
  */
 
+/* CB: Odin32/WINE bugs
+  - IMAGELIST_Draw draws a line too much at the bottom of the bitmap
+*/
+
 #include <string.h>
 
@@ -1514 +1518 @@
             lstrcpynA (lpTbInfo->pszText,
                          (LPSTR)infoPtr->strings[btnPtr->iString],
-                         lpTbInfo->cchText);
+                         MIN(lpTbInfo->cchText,lstrlenA((LPSTR)infoPtr->strings[btnPtr->iString])));
     }
 
@@ -2057 +2061 @@
     TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd);
 
-    if ((LOWORD(lParam) <= 0) || (HIWORD(lParam)<=0)) return FALSE;
+    if ((LOWORD(lParam) <= 0) || (HIWORD(lParam) <= 0)) return FALSE;
 
     infoPtr->nBitmapWidth = (INT)LOWORD(lParam);
@@ -2474 +2478 @@
 
             nmttc.hdr.hwndFrom = hwnd;
-            nmttc.hdr.idFrom   = GetWindowLongA (hwnd, GWL_ID);
+            nmttc.hdr.idFrom   = GetWindowLongA(hwnd,GWL_ID);
             nmttc.hdr.code = NM_TOOLTIPSCREATED;
             nmttc.hwndToolTips = infoPtr->hwndToolTip;
 
-            SendMessageA (infoPtr->hwndNotify, WM_NOTIFY,
-                          (WPARAM)nmttc.hdr.idFrom, (LPARAM)&nmttc);
+            SendMessageA(infoPtr->hwndNotify,WM_NOTIFY,(WPARAM)nmttc.hdr.idFrom,(LPARAM)&nmttc);
         }
     }
@@ -2691 +2694 @@
     INT   nHit;
     HDC   hdc;
+    DWORD dwStyle = GetWindowLongA(hwnd,GWL_STYLE);
 
     if (infoPtr->hwndToolTip)
@@ -2711 +2715 @@
           oldBtnPtr->bHot = FALSE;
 
-          InvalidateRect (hwnd, &oldBtnPtr->rect, TRUE);
+          if (dwStyle & TBSTYLE_FLAT) InvalidateRect(hwnd,&oldBtnPtr->rect,TRUE);
         }
       }
@@ -2723 +2727 @@
           btnPtr->bHot = TRUE;
 
-          hdc = GetDC (hwnd);
-          TOOLBAR_DrawButton (hwnd, btnPtr, hdc);
-          ReleaseDC (hwnd, hdc);
+          if (dwStyle & TBSTYLE_FLAT)
+          {
+            hdc = GetDC (hwnd);
+            TOOLBAR_DrawButton (hwnd, btnPtr, hdc);
+            ReleaseDC (hwnd, hdc);
+          }
 
           infoPtr->nHotItem = nHit;
@@ -2864 +2871 @@
 
     TOOLBAR_CalcToolbar(hwnd);
-    hdc = wParam==0 ? BeginPaint(hwnd,&ps) : (HDC)wParam;
+    hdc = wParam == 0 ? BeginPaint(hwnd,&ps) : (HDC)wParam;
     TOOLBAR_Refresh(hwnd,hdc);
     if (!wParam) EndPaint (hwnd, &ps);