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

Timestamp:

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

Author:

cbratschi

Message:

bug fixes (unicode) and improvements

File:

• trunk/src/comctl32/tab.c (modified) (98 diffs)

trunk/src/comctl32/tab.c

@@ -1 @@
-/* $Id: tab.c,v 1.5 1999-06-23 19:45:01 achimha Exp $ */
+/* $Id: tab.c,v 1.6 1999-06-28 15:46:26 cbratschi Exp $ */
 /*
  * Tab control
@@ -7 +7 @@
  * Copyright 1999 Francis Beaudet
  * Copyright 1999 Achim Hasenmueller
+ * Copyright 1999 Christoph Bratschi
  *
  * TODO:
@@ -83 +84 @@
 {
     TAB_INFO *infoPtr = TAB_GetInfoPtr(hwnd);
- 
+
     return infoPtr->iSelected;
 }
@@ -91 +92 @@
 {
     TAB_INFO *infoPtr = TAB_GetInfoPtr(hwnd);
- 
+
     return infoPtr->uFocus;
 }
@@ -111 +112 @@
   INT iItem=(INT) wParam;
   INT prevItem;
- 
+
   prevItem=-1;
   if ((iItem >= 0) && (iItem < infoPtr->uNumItem)) {
@@ -125 +126 @@
   TAB_INFO *infoPtr = TAB_GetInfoPtr(hwnd);
   INT iItem=(INT) wParam;
- 
+
   if ((iItem < 0) || (iItem > infoPtr->uNumItem)) return 0;
 
@@ -131 +132 @@
   if (GetWindowLongA(hwnd, GWL_STYLE) & TCS_BUTTONS) {
 //    FIXME (tab,"Should set input focus\n");
-  } else { 
+  } else {
     if (infoPtr->iSelected != iItem) {
       if (TAB_SendSimpleNotify(hwnd, TCN_SELCHANGING)!=TRUE)  {
@@ -137 +138 @@
         TAB_SendSimpleNotify(hwnd, TCN_SELCHANGE);
 
-        TAB_EnsureSelectionVisible(hwnd, infoPtr);
-        TAB_InvalidateTabArea(hwnd, infoPtr);
+        TAB_EnsureSelectionVisible(hwnd, infoPtr);
+        TAB_InvalidateTabArea(hwnd, infoPtr);
       }
     }
@@ -176 +177 @@
    * Perform a sanity check and a trivial visibility check.
    */
-  if ( (infoPtr->uNumItem <=0) || 
+  if ( (infoPtr->uNumItem == 0) ||
        (itemIndex >= infoPtr->uNumItem) ||
        (itemIndex < infoPtr->leftmostVisible) )
@@ -187 +188 @@
   if (itemRect==NULL)
     itemRect = &tmpItemRect;
-  
+
   /*
    * Retrieve the unmodified item rect.
@@ -194 +195 @@
 
   /*
-   * "scroll" it to make sure the item at the very left of the 
+   * "scroll" it to make sure the item at the very left of the
    * tab control is the leftmost visible tab.
    */
   OffsetRect(itemRect,
-             -infoPtr->items[infoPtr->leftmostVisible].rect.left, 
-             0);
-
-  /*
-   * Move the rectangle so the first item is slightly offset from 
+             -infoPtr->items[infoPtr->leftmostVisible].rect.left,
+             0);
+
+  /*
+   * Move the rectangle so the first item is slightly offset from
    * the left of the tab control.
    */
   OffsetRect(itemRect,
-             SELECTED_TAB_OFFSET,
-             0);
+             SELECTED_TAB_OFFSET,
+             0);
 
 
@@ -225 +226 @@
      * If it also a bit higher.
      */
-    if (GetWindowLongA(hwnd, GWL_STYLE) & TCS_BOTTOM) 
-    {      
+    if (GetWindowLongA(hwnd, GWL_STYLE) & TCS_BOTTOM)
+    {
       selectedRect->top    -=2; /* the border is thicker on the bottom */
       selectedRect->bottom +=SELECTED_TAB_OFFSET;
@@ -242 +243 @@
 static BOOL TAB_GetItemRect(HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
-  return TAB_InternalGetItemRect(hwnd, TAB_GetInfoPtr(hwnd), (INT)wParam, 
+  return TAB_InternalGetItemRect(hwnd, TAB_GetInfoPtr(hwnd), (INT)wParam,
                                  (LPRECT)lParam, (LPRECT)NULL);
 }
@@ -252 +253 @@
  */
 static LRESULT TAB_KeyUp(
-  HWND   hwnd, 
+  HWND   hwnd,
   WPARAM keyCode)
 {
@@ -267 +268 @@
       break;
   }
-  
+
   /*
    * If we changed to a valid item, change the selection
@@ -296 +297 @@
  */
 static LRESULT TAB_FocusChanging(
-  HWND   hwnd, 
-  UINT   uMsg, 
-  WPARAM wParam, 
+  HWND   hwnd,
+  UINT   uMsg,
+  WPARAM wParam,
   LPARAM lParam)
 {
@@ -309 +310 @@
    */
   isVisible = TAB_InternalGetItemRect(hwnd,
-                                      infoPtr,
-                                      infoPtr->uFocus,
-                                      NULL,
-                                      &selectedRect);
-  
+                                      infoPtr,
+                                      infoPtr->uFocus,
+                                      NULL,
+                                      &selectedRect);
+
   /*
    * If the rectangle is not completely invisible, invalidate that
@@ -331 +332 @@
 static HWND TAB_InternalHitTest (
   HWND      hwnd,
-  TAB_INFO* infoPtr, 
-  POINT     pt, 
+  TAB_INFO* infoPtr,
+  POINT     pt,
   UINT*     flags)
 
 {
   RECT rect;
-  int iCount; 
-  
-  for (iCount = 0; iCount < infoPtr->uNumItem; iCount++) 
+  int iCount;
+
+  for (iCount = 0; iCount < infoPtr->uNumItem; iCount++)
   {
     TAB_InternalGetItemRect(hwnd,
-                            infoPtr, 
-                            iCount,
-                            &rect,
-                            NULL);
+                            infoPtr,
+                            iCount,
+                            &rect,
+                            NULL);
 
     if (PtInRect (&rect, pt))
@@ -363 +364 @@
   TAB_INFO *infoPtr = TAB_GetInfoPtr(hwnd);
   LPTCHITTESTINFO lptest=(LPTCHITTESTINFO) lParam;
-  
+
   return TAB_InternalHitTest (hwnd, infoPtr,lptest->pt,&lptest->flags);
 }
@@ -375 +376 @@
   if (infoPtr->hwndToolTip)
     TAB_RelayEvent (infoPtr->hwndToolTip, hwnd,
-                    WM_LBUTTONDOWN, wParam, lParam);
+                    WM_LBUTTONDOWN, wParam, lParam);
 
   if (GetWindowLongA(hwnd, GWL_STYLE) & TCS_FOCUSONBUTTONDOWN ) {
@@ -389 +390 @@
   POINT pt;
   INT newItem,dummy;
-  
+
   if (infoPtr->hwndToolTip)
     TAB_RelayEvent (infoPtr->hwndToolTip, hwnd,
-                    WM_LBUTTONDOWN, wParam, lParam);
-  
+                    WM_LBUTTONDOWN, wParam, lParam);
+
   pt.x = (INT)LOWORD(lParam);
   pt.y = (INT)HIWORD(lParam);
-  
+
   newItem=TAB_InternalHitTest (hwnd, infoPtr,pt,(unsigned int*)&dummy);
-  
+
 //  TRACE(tab, "On Tab, item %d\n", newItem);
-    
+
   if ( (newItem!=-1) &&
        (infoPtr->iSelected != newItem) )
@@ -434 +435 @@
   if (infoPtr->hwndToolTip)
     TAB_RelayEvent (infoPtr->hwndToolTip, hwnd,
-                    WM_LBUTTONDOWN, wParam, lParam);
+                    WM_LBUTTONDOWN, wParam, lParam);
   return 0;
 }
@@ -445 +446 @@
  */
 static LRESULT TAB_AdjustRect(
-  HWND   hwnd, 
-  WPARAM fLarger, 
+  HWND   hwnd,
+  WPARAM fLarger,
   LPRECT prc)
 {
   TAB_INFO *infoPtr = TAB_GetInfoPtr(hwnd);
 
-  if (fLarger) 
+  if (fLarger)
   {
     /*
@@ -460 +461 @@
      * Add the height of the tabs.
      */
-    if (GetWindowLongA(hwnd, GWL_STYLE) & TCS_BOTTOM) 
+    if (GetWindowLongA(hwnd, GWL_STYLE) & TCS_BOTTOM)
       prc->bottom += infoPtr->tabHeight;
     else
@@ -475 +476 @@
     InflateRect(prc, CONTROL_BORDER_SIZEX, CONTROL_BORDER_SIZEX);
   }
-  else 
+  else
   {
     /*
      * Go from window rectangle.
      */
-  
+
     /*
      * Deflate the rectangle for the border
@@ -494 +495 @@
      * Remove the height of the tabs.
      */
-    if (GetWindowLongA(hwnd, GWL_STYLE) & TCS_BOTTOM) 
+    if (GetWindowLongA(hwnd, GWL_STYLE) & TCS_BOTTOM)
       prc->bottom -= infoPtr->tabHeight;
     else
@@ -500 +501 @@
 
   }
-  
+
   return 0;
 }
@@ -511 +512 @@
  */
 static LRESULT TAB_OnHScroll(
-  HWND    hwnd, 
+  HWND    hwnd,
   int     nScrollCode,
   int     nPos,
@@ -543 +544 @@
  * TAB_SetupScroling
  *
- * This method will check the current scrolling state and make sure the 
+ * This method will check the current scrolling state and make sure the
  * scrolling control is displayed (or not).
  */
@@ -561 +562 @@
     controlPos.left  = controlPos.right - 2*GetSystemMetrics(SM_CXHSCROLL);
 
-    if (GetWindowLongA(hwnd, GWL_STYLE) & TCS_BOTTOM) 
+    if (GetWindowLongA(hwnd, GWL_STYLE) & TCS_BOTTOM)
     {
       controlPos.top    = clientRect->bottom - infoPtr->tabHeight;
@@ -583 +584 @@
        */
       infoPtr->hwndUpDown = CreateWindowA("ScrollBar",
-                                          "",
-                                          WS_VISIBLE | WS_CHILD | WS_OVERLAPPED | SBS_HORZ,
-                                          controlPos.left, controlPos.top,
-                                          controlPos.right - controlPos.left,
-                                          controlPos.bottom - controlPos.top,
-                                          hwnd,
-                                          (HMENU)NULL, 
-                                          (HINSTANCE)NULL, 
-                                          NULL);        
+                                          "",
+                                          WS_VISIBLE | WS_CHILD | WS_OVERLAPPED | SBS_HORZ,
+                                          controlPos.left, controlPos.top,
+                                          controlPos.right - controlPos.left,
+                                          controlPos.bottom - controlPos.top,
+                                          hwnd,
+                                          (HMENU)NULL,
+                                          (HINSTANCE)NULL,
+                                          NULL);
     }
     else
     {
-      SetWindowPos(infoPtr->hwndUpDown, 
-                   (HWND)NULL,
-                   controlPos.left, controlPos.top,
-                   controlPos.right - controlPos.left,
-                   controlPos.bottom - controlPos.top,
-                   SWP_SHOWWINDOW | SWP_NOZORDER);                 
+      SetWindowPos(infoPtr->hwndUpDown,
+                   (HWND)NULL,
+                   controlPos.left, controlPos.top,
+                   controlPos.right - controlPos.left,
+                   controlPos.bottom - controlPos.top,
+                   SWP_SHOWWINDOW | SWP_NOZORDER);
     }
   }
@@ -641 +642 @@
    * a font.
    */
-  hdc = GetDC(hwnd); 
-    
+  hdc = GetDC(hwnd);
+
   hFont = infoPtr->hFont ? infoPtr->hFont : GetStockObject (SYSTEM_FONT);
   hOldFont = SelectObject (hdc, hFont);
@@ -651 +652 @@
    */
   GetClientRect(hwnd, &clientRect);
-  
+
   /*
    * The leftmost item will be "0" aligned
@@ -665 +666 @@
 
     /*
-     * Make sure there is enough space for the letters + growing the 
-     * selected item + extra space for the selected item.   
-     */
-    infoPtr->tabHeight = fontMetrics.tmHeight + 2*VERTICAL_ITEM_PADDING +  
+     * Make sure there is enough space for the letters + growing the
+     * selected item + extra space for the selected item.
+     */
+    infoPtr->tabHeight = fontMetrics.tmHeight + 2*VERTICAL_ITEM_PADDING +
       SELECTED_TAB_OFFSET;
   }
@@ -677 +678 @@
      * Calculate the vertical position of the tab
      */
-    if (lStyle & TCS_BOTTOM) 
-    {
-      infoPtr->items[curItem].rect.bottom = clientRect.bottom - 
+    if (lStyle & TCS_BOTTOM)
+    {
+      infoPtr->items[curItem].rect.bottom = clientRect.bottom -
                                             SELECTED_TAB_OFFSET;
-      infoPtr->items[curItem].rect.top = clientRect.bottom - 
+      infoPtr->items[curItem].rect.top = clientRect.bottom -
                                          infoPtr->tabHeight;
     }
-    else 
-    {
-      infoPtr->items[curItem].rect.top = clientRect.top + 
+    else
+    {
+      infoPtr->items[curItem].rect.top = clientRect.top +
                                          SELECTED_TAB_OFFSET;
-      infoPtr->items[curItem].rect.bottom = clientRect.top + 
+      infoPtr->items[curItem].rect.bottom = clientRect.top +
                                             infoPtr->tabHeight;
     }
@@ -708 +709 @@
        * Calculate how wide the tab is depending on the text it contains
        */
-      GetTextExtentPoint32A(hdc, infoPtr->items[curItem].pszText, 
+      GetTextExtentPoint32A(hdc, infoPtr->items[curItem].pszText,
                             lstrlenA(infoPtr->items[curItem].pszText), &size);
-      
+
       infoPtr->items[curItem].rect.right = infoPtr->items[curItem].rect.left +
                                            size.cx + 2*HORIZONTAL_ITEM_PADDING;
@@ -716 +717 @@
 
 //    TRACE(tab, "TextSize: %i\n ", size.cx);
-//    TRACE(tab, "Rect: T %i, L %i, B %i, R %i\n", 
-//        infoPtr->items[curItem].rect.top,
-//        infoPtr->items[curItem].rect.left,
-//        infoPtr->items[curItem].rect.bottom,
-//        infoPtr->items[curItem].rect.right);  
+//    TRACE(tab, "Rect: T %i, L %i, B %i, R %i\n",
+//        infoPtr->items[curItem].rect.top,
+//        infoPtr->items[curItem].rect.left,
+//        infoPtr->items[curItem].rect.bottom,
+//        infoPtr->items[curItem].rect.right);
 
     /*
@@ -735 +736 @@
    * Check if we need a scrolling control.
    */
-  infoPtr->needsScrolling = (curItemLeftPos + (2*SELECTED_TAB_OFFSET) > 
+  infoPtr->needsScrolling = (curItemLeftPos + (2*SELECTED_TAB_OFFSET) >
                              clientRect.right);
 
-  TAB_SetupScrolling(hwnd, infoPtr, &clientRect);      
-  
+  TAB_SetupScrolling(hwnd, infoPtr, &clientRect);
+
   /*
    * Cleanup
@@ -751 +752 @@
  *
  * This method is used to draw a single tab into the tab control.
- */         
+ */
 static void TAB_DrawItem(
-  HWND hwnd, 
-  HDC  hdc, 
+  HWND hwnd,
+  HDC  hdc,
   INT  iItem)
 {
@@ -768 +769 @@
    */
   isVisible = TAB_InternalGetItemRect(hwnd,
-                                      infoPtr,
-                                      iItem,
-                                      &itemRect,
-                                      &selectedRect);
+                                      infoPtr,
+                                      iItem,
+                                      &itemRect,
+                                      &selectedRect);
 
   if (isVisible)
   {
-    HBRUSH hbr       = CreateSolidBrush (GetSysColor(COLOR_BTNFACE));    
+    HBRUSH hbr       = CreateSolidBrush (GetSysColor(COLOR_BTNFACE));
     HPEN   hwPen     = GetSysColorPen (COLOR_3DHILIGHT);
     HPEN   hbPen     = GetSysColorPen (COLOR_BTNSHADOW);
@@ -782 +783 @@
     HPEN   holdPen;
     INT    oldBkMode;
-    INT    cx,cy; 
+    INT    cx,cy;
 
     if (lStyle & TCS_BUTTONS)
     {
-      /* 
+      /*
        * Get item rectangle.
        */
@@ -795 +796 @@
       if (iItem == infoPtr->iSelected)
       {
-        /* 
-         * Background color. 
+        /*
+         * Background color.
          */
         if (!(lStyle & TCS_OWNERDRAWFIXED))
-          hbr = CreateSolidBrush(GetSysColor(COLOR_3DHILIGHT));    
+          hbr = CreateSolidBrush(GetSysColor(COLOR_3DHILIGHT));
 
         /*
          * Erase the background.
-         */     
+         */
         FillRect(hdc, &r, hbr);
 
@@ -819 +820 @@
         LineTo   (hdc, r.right, r.bottom);
         LineTo   (hdc, r.right, r.top);
-        
+
         /* shadow */
         SelectObject(hdc, hbPen);
@@ -829 +830 @@
         /*
          * Erase the background.
-         */     
+         */
         FillRect(hdc, &r, hbr);
 
@@ -836 +837 @@
         LineTo   (hdc, r.left, r.top);
         LineTo   (hdc, r.right, r.top);
-        
+
         /* shadow */
         SelectObject(hdc, hbPen);
@@ -845 +846 @@
     else
     {
-      /* 
-       * Background color. 
+      /*
+       * Background color.
        */
-      hbr = CreateSolidBrush(GetSysColor(COLOR_BTNFACE));    
+      hbr = CreateSolidBrush(GetSysColor(COLOR_BTNFACE));
 
       /*
@@ -861 +862 @@
       /*
        * Erase the background.
-       * This is necessary when drawing the selected item since it is larger 
-       * than the others, it might overlap with stuff already drawn by the 
+       * This is necessary when drawing the selected item since it is larger
+       * than the others, it might overlap with stuff already drawn by the
        * other tabs
-       */     
+       */
       FillRect(hdc, &r, hbr);
 
@@ -875 +876 @@
       r.right--;
       r.bottom--;
-      
+
       holdPen = SelectObject (hdc, hwPen);
 
-      if (lStyle & TCS_BOTTOM) 
+      if (lStyle & TCS_BOTTOM)
       {
         /* highlight */
@@ -884 +885 @@
         LineTo   (hdc, r.left, r.bottom - ROUND_CORNER_SIZE);
         LineTo   (hdc, r.left + ROUND_CORNER_SIZE, r.bottom);
-        
+
         /* shadow */
         SelectObject(hdc, hbPen);
@@ -891 +892 @@
         LineTo  (hdc, r.right, r.top);
       }
-      else 
+      else
       {
         /* highlight */
@@ -898 +899 @@
         LineTo   (hdc, r.left + ROUND_CORNER_SIZE, r.top);
         LineTo   (hdc, r.right - ROUND_CORNER_SIZE, r.top);
-        
+
         /* shadow */
         SelectObject(hdc, hbPen);
@@ -905 +906 @@
       }
     }
-  
+
     /*
      * Text pen
      */
-    SelectObject(hdc, hsdPen); 
-
-    oldBkMode = SetBkMode(hdc, TRANSPARENT); 
+    SelectObject(hdc, hsdPen);
+
+    oldBkMode = SetBkMode(hdc, TRANSPARENT);
     SetTextColor (hdc, COLOR_BTNTEXT);
 
@@ -922 +923 @@
      * Draw the icon.
      */
-    if (infoPtr->himl) 
-    {
-      ImageList_Draw (infoPtr->himl, iItem, hdc, 
-                      r.left, r.top+1, ILD_NORMAL);
+    if (infoPtr->himl)
+    {
+      ImageList_Draw (infoPtr->himl, iItem, hdc,
+                      r.left, r.top+1, ILD_NORMAL);
       ImageList_GetIconSize (infoPtr->himl, &cx, &cy);
       r.left+=cx;
@@ -934 +935 @@
      */
     DrawTextA(hdc,
-              infoPtr->items[iItem].pszText, 
-              lstrlenA(infoPtr->items[iItem].pszText),
-              &r, 
-              DT_LEFT|DT_SINGLELINE|DT_VCENTER);
+              infoPtr->items[iItem].pszText,
+              lstrlenA(infoPtr->items[iItem].pszText),
+              &r,
+              DT_LEFT|DT_SINGLELINE|DT_VCENTER);
 
     /*
@@ -943 +944 @@
      */
     if (((lStyle & TCS_FOCUSNEVER) == 0) &&
-         (GetFocus() == hwnd) &&
-         (iItem == infoPtr->uFocus) )
+         (GetFocus() == hwnd) &&
+         (iItem == infoPtr->uFocus) )
     {
       InflateRect(&r, FOCUS_RECT_HOFFSET, FOCUS_RECT_VOFFSET);
@@ -951 +952 @@
 
       MoveToEx (hdc, r.left,    r.top, NULL);
-      LineTo   (hdc, r.right-1, r.top); 
+      LineTo   (hdc, r.right-1, r.top);
       LineTo   (hdc, r.right-1, r.bottom -1);
       LineTo   (hdc, r.left,    r.bottom -1);
@@ -970 +971 @@
  * This method is used to draw the raised border around the tab control
  * "content" area.
- */         
+ */
 static void TAB_DrawBorder (HWND hwnd, HDC hdc)
 {
@@ -985 +986 @@
    * Adjust for the style
    */
-  if (GetWindowLongA(hwnd, GWL_STYLE) & TCS_BOTTOM) 
+  if (GetWindowLongA(hwnd, GWL_STYLE) & TCS_BOTTOM)
   {
     rect.bottom -= infoPtr->tabHeight;
@@ -1003 +1004 @@
   /* highlight */
   htmPen = SelectObject (hdc, hwPen);
-  
+
   MoveToEx (hdc, rect.left, rect.bottom, NULL);
-  LineTo (hdc, rect.left, rect.top); 
+  LineTo (hdc, rect.left, rect.top);
   LineTo (hdc, rect.right, rect.top);
 
@@ -1026 +1027 @@
  *
  * This method repaints the tab control..
- */             
+ */
 static void TAB_Refresh (HWND hwnd, HDC hdc)
 {
@@ -1040 +1041 @@
   if (GetWindowLongA(hwnd, GWL_STYLE) & TCS_BUTTONS)
   {
-    for (i = 0; i < infoPtr->uNumItem; i++) 
-    {
-        TAB_DrawItem (hwnd, hdc, i);
+    for (i = 0; i < infoPtr->uNumItem; i++)
+    {
+        TAB_DrawItem (hwnd, hdc, i);
     }
   }
@@ -1050 +1051 @@
      * Draw all the non selected item first.
      */
-    for (i = 0; i < infoPtr->uNumItem; i++) 
+    for (i = 0; i < infoPtr->uNumItem; i++)
     {
       if (i != infoPtr->iSelected)
-        TAB_DrawItem (hwnd, hdc, i);
+        TAB_DrawItem (hwnd, hdc, i);
     }
 
@@ -1075 +1076 @@
 {
     TAB_INFO *infoPtr = TAB_GetInfoPtr(hwnd);
-  
+
   infoPtr->DoRedraw=(BOOL) wParam;
   return 0;
@@ -1081 +1082 @@
 
 static LRESULT TAB_EraseBackground(
-  HWND hwnd, 
+  HWND hwnd,
   HDC  givenDC)
 {
@@ -1135 +1136 @@
   GetClientRect(infoPtr->hwndUpDown, &scrollerRect);
   visibleRect.right -= scrollerRect.right;
-  
+
   /*
    * Get the rectangle for the item
    */
   isVisible = TAB_InternalGetItemRect(hwnd,
-                                      infoPtr,
-                                      infoPtr->iSelected,
-                                      NULL,
-                                      &selectedRect);
+                                      infoPtr,
+                                      infoPtr->iSelected,
+                                      NULL,
+                                      &selectedRect);
 
   /*
@@ -1163 +1164 @@
 
   while ( (infoPtr->leftmostVisible < infoPtr->iSelected) &&
-          !isVisible)
+          !isVisible)
   {
     infoPtr->leftmostVisible++;
@@ -1171 +1172 @@
      */
     isVisible = TAB_InternalGetItemRect(hwnd,
-                                        infoPtr,
-                                        infoPtr->iSelected,
-                                        NULL,
-                                        &selectedRect);
+                                        infoPtr,
+                                        infoPtr->iSelected,
+                                        NULL,
+                                        &selectedRect);
 
     /*
@@ -1189 +1190 @@
       pt2.x = selectedRect.right - 1;
       pt2.y = selectedRect.bottom - 1;
-      
+
       isVisible = PtInRect(&visibleRect, pt1) &&  PtInRect(&visibleRect, pt2);
     }
@@ -1210 +1211 @@
   GetClientRect(hwnd, &clientRect);
 
-  if (GetWindowLongA(hwnd, GWL_STYLE) & TCS_BOTTOM) 
+  if (GetWindowLongA(hwnd, GWL_STYLE) & TCS_BOTTOM)
   {
     clientRect.top = clientRect.bottom - (infoPtr->tabHeight + 1);
@@ -1227 +1228 @@
   HDC hdc;
   PAINTSTRUCT ps;
-    
+
   hdc = wParam== 0 ? BeginPaint (hwnd, &ps) : (HDC)wParam;
   TAB_Refresh (hwnd, hdc);
-    
+
   if(!wParam)
     EndPaint (hwnd, &ps);
@@ -1239 +1240 @@
 static LRESULT
 TAB_InsertItem (HWND hwnd, WPARAM wParam, LPARAM lParam)
-{    
+{
   TAB_INFO *infoPtr = TAB_GetInfoPtr(hwnd);
   TCITEMA *pti;
   INT iItem, len;
   RECT rect;
-  
+
   GetClientRect (hwnd, &rect);
 //  TRACE(tab, "Rect: %x T %i, L %i, B %i, R %i\n", hwnd,
-//        rect.top, rect.left, rect.bottom, rect.right);  
-  
+//        rect.top, rect.left, rect.bottom, rect.right);
+
   pti = (TCITEMA *)lParam;
   iItem = (INT)wParam;
-  
+
   if (iItem < 0) return -1;
   if (iItem > infoPtr->uNumItem)
     iItem = infoPtr->uNumItem;
-  
+
   if (infoPtr->uNumItem == 0) {
     infoPtr->items = COMCTL32_Alloc (sizeof (TAB_ITEM));
@@ -1262 +1263 @@
   else {
     TAB_ITEM *oldItems = infoPtr->items;
-    
+
     infoPtr->uNumItem++;
     infoPtr->items = COMCTL32_Alloc (sizeof (TAB_ITEM) * infoPtr->uNumItem);
-    
+
     /* pre insert copy */
     if (iItem > 0) {
       memcpy (&infoPtr->items[0], &oldItems[0],
-              iItem * sizeof(TAB_ITEM));
-    }
-    
+              iItem * sizeof(TAB_ITEM));
+    }
+
     /* post insert copy */
     if (iItem < infoPtr->uNumItem - 1) {
       memcpy (&infoPtr->items[iItem+1], &oldItems[iItem],
-              (infoPtr->uNumItem - iItem - 1) * sizeof(TAB_ITEM));
-      
-    }
-    
+              (infoPtr->uNumItem - iItem - 1) * sizeof(TAB_ITEM));
+
+    }
+
     COMCTL32_Free (oldItems);
   }
-  
+
   infoPtr->items[iItem].mask = pti->mask;
   if (pti->mask & TCIF_TEXT) {
@@ -1289 +1290 @@
     infoPtr->items[iItem].cchTextMax = pti->cchTextMax;
   }
-  
+
   if (pti->mask & TCIF_IMAGE)
     infoPtr->items[iItem].iImage = pti->iImage;
-  
+
   if (pti->mask & TCIF_PARAM)
     infoPtr->items[iItem].lParam = pti->lParam;
-  
+
   TAB_InvalidateTabArea(hwnd, infoPtr);
-  
+
 //  TRACE(tab, "[%04x]: added item %d '%s'\n",
-//      hwnd, iItem, infoPtr->items[iItem].pszText);
+//      hwnd, iItem, infoPtr->items[iItem].pszText);
 
   TAB_SetItemBounds(hwnd);
@@ -1305 +1306 @@
 }
 
-static LRESULT 
+static LRESULT
 TAB_SetItemSize (HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
@@ -1322 +1323 @@
 }
 
-static LRESULT 
+static LRESULT
 TAB_SetItemA (HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
   TAB_INFO *infoPtr = TAB_GetInfoPtr(hwnd);
-  TCITEMA *tabItem; 
-  TAB_ITEM *wineItem; 
+  TCITEMA *tabItem;
+  TAB_ITEM *wineItem;
   INT    iItem,len;
 
@@ -1337 +1338 @@
   wineItem=& infoPtr->items[iItem];
 
-  if (tabItem->mask & TCIF_IMAGE) 
+  if (tabItem->mask & TCIF_IMAGE)
     wineItem->iImage=tabItem->iImage;
 
-  if (tabItem->mask & TCIF_PARAM) 
+  if (tabItem->mask & TCIF_PARAM)
     wineItem->lParam=tabItem->lParam;
 
-//  if (tabItem->mask & TCIF_RTLREADING) 
+//  if (tabItem->mask & TCIF_RTLREADING)
 //    FIXME (tab,"TCIF_RTLREADING\n");
 
-  if (tabItem->mask & TCIF_STATE) 
+  if (tabItem->mask & TCIF_STATE)
     wineItem->dwState=tabItem->dwState;
 
   if (tabItem->mask & TCIF_TEXT) {
-   len=lstrlenA (tabItem->pszText);
-   if (len>wineItem->cchTextMax) 
-     wineItem->pszText= COMCTL32_ReAlloc (wineItem->pszText, len+1);
+   len = lstrlenA (tabItem->pszText);
+   if (len>wineItem->cchTextMax)
+     wineItem->pszText = COMCTL32_ReAlloc (wineItem->pszText, len+1);
    lstrcpynA (wineItem->pszText, tabItem->pszText, len);
   }
@@ -1359 +1360 @@
 }
 
-static LRESULT 
+static LRESULT
 TAB_GetItemCount (HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
@@ -1368 +1369 @@
 
 
-static LRESULT 
+static LRESULT
 TAB_GetItemA (HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
@@ -1383 +1384 @@
   wineItem=& infoPtr->items[iItem];
 
-  if (tabItem->mask & TCIF_IMAGE) 
+  if (tabItem->mask & TCIF_IMAGE)
     tabItem->iImage=wineItem->iImage;
 
-  if (tabItem->mask & TCIF_PARAM) 
+  if (tabItem->mask & TCIF_PARAM)
     tabItem->lParam=wineItem->lParam;
 
-//  if (tabItem->mask & TCIF_RTLREADING) 
+//  if (tabItem->mask & TCIF_RTLREADING)
 //    FIXME (tab, "TCIF_RTLREADING\n");
 
-  if (tabItem->mask & TCIF_STATE) 
+  if (tabItem->mask & TCIF_STATE)
     tabItem->dwState=wineItem->dwState;
 
-  if (tabItem->mask & TCIF_TEXT) 
+  if (tabItem->mask & TCIF_TEXT)
    lstrcpynA (tabItem->pszText, wineItem->pszText, tabItem->cchTextMax);
 
@@ -1401 +1402 @@
 }
 
-static LRESULT 
+static LRESULT
 TAB_DeleteItem (HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
@@ -1411 +1412 @@
   {
     TAB_ITEM *oldItems = infoPtr->items;
-    
+
     infoPtr->uNumItem--;
     infoPtr->items = COMCTL32_Alloc(sizeof (TAB_ITEM) * infoPtr->uNumItem);
-    
-    if (iItem > 0) 
+
+    if (iItem > 0)
       memcpy(&infoPtr->items[0], &oldItems[0], iItem * sizeof(TAB_ITEM));
-    
-    if (iItem < infoPtr->uNumItem) 
+
+    if (iItem < infoPtr->uNumItem)
       memcpy(&infoPtr->items[iItem], &oldItems[iItem + 1],
               (infoPtr->uNumItem - iItem) * sizeof(TAB_ITEM));
-    
+
     COMCTL32_Free (oldItems);
 
@@ -1429 +1430 @@
     if ((iItem == infoPtr->iSelected) && (iItem > 0))
       infoPtr->iSelected--;
-      
+
     if (iItem < infoPtr->iSelected)
       infoPtr->iSelected--;
@@ -1445 +1446 @@
 }
 
-static LRESULT 
+static LRESULT
 TAB_DeleteAllItems (HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
@@ -1452 +1453 @@
   COMCTL32_Free (infoPtr->items);
   infoPtr->uNumItem=0;
-  
+
   return TRUE;
 }
@@ -1471 +1472 @@
 {
   TAB_INFO *infoPtr = TAB_GetInfoPtr(hwnd);
-  
+
 //  TRACE (tab,"%x %lx\n",wParam, lParam);
-  
+
   infoPtr->hFont = (HFONT)wParam;
-  
+
   TAB_SetItemBounds(hwnd);
 
@@ -1525 +1526 @@
     cx=LOWORD (lParam);
     cy=HIWORD (lParam);
-    if (GetWindowLongA(hwnd, GWL_STYLE) & CCS_NORESIZE) 
+    if (GetWindowLongA(hwnd, GWL_STYLE) & CCS_NORESIZE)
         uPosFlags |= (SWP_NOSIZE | SWP_NOMOVE);
 
@@ -1548 +1549 @@
 
 
-static LRESULT 
+static LRESULT
 TAB_Create (HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
@@ -1559 +1560 @@
 
   SetWindowLongA(hwnd, 0, (DWORD)infoPtr);
-   
+
   infoPtr->uNumItem        = 0;
   infoPtr->hFont           = 0;
   infoPtr->items           = 0;
   infoPtr->hcurArrow       = LoadCursorA (0, IDC_ARROWA);
-  infoPtr->iSelected       = 0;  
-  infoPtr->uFocus          = 0;  
+  infoPtr->iSelected       = 0;
+  infoPtr->uFocus          = 0;
   infoPtr->hwndToolTip     = 0;
   infoPtr->DoRedraw        = TRUE;
@@ -1571 +1572 @@
   infoPtr->hwndUpDown      = 0;
   infoPtr->leftmostVisible = 0;
-  
-//  TRACE(tab, "Created tab control, hwnd [%04x]\n", hwnd); 
+
+//  TRACE(tab, "Created tab control, hwnd [%04x]\n", hwnd);
   if (GetWindowLongA(hwnd, GWL_STYLE) & TCS_TOOLTIPS) {
     /* Create tooltip control */
     infoPtr->hwndToolTip =
       CreateWindowExA (0, TOOLTIPS_CLASSA, NULL, 0,
-                       CW_USEDEFAULT, CW_USEDEFAULT,
-                       CW_USEDEFAULT, CW_USEDEFAULT,
-                       hwnd, 0, 0, 0);
-    
+                       CW_USEDEFAULT, CW_USEDEFAULT,
+                       CW_USEDEFAULT, CW_USEDEFAULT,
+                       hwnd, 0, 0, 0);
+
     /* Send NM_TOOLTIPSCREATED notification */
     if (infoPtr->hwndToolTip) {
       NMTOOLTIPSCREATED nmttc;
-      
+
       nmttc.hdr.hwndFrom = hwnd;
       nmttc.hdr.idFrom = GetWindowLongA(hwnd, GWL_ID);
       nmttc.hdr.code = NM_TOOLTIPSCREATED;
       nmttc.hwndToolTips = infoPtr->hwndToolTip;
-      
+
       SendMessageA (GetParent (hwnd), WM_NOTIFY,
-                    (WPARAM)GetWindowLongA(hwnd, GWL_ID), (LPARAM)&nmttc);
-    }
-  }  
-    
+                    (WPARAM)GetWindowLongA(hwnd, GWL_ID), (LPARAM)&nmttc);
+    }
+  }
+
   /*
    * We need to get text information so we need a DC and we need to select
    * a font.
    */
-  hdc = GetDC(hwnd); 
+  hdc = GetDC(hwnd);
   hOldFont = SelectObject (hdc, GetStockObject (SYSTEM_FONT));
 
@@ -1608 +1609 @@
 
   /*
-   * Make sure there is enough space for the letters + growing the 
-   * selected item + extra space for the selected item.   
-   */
-  infoPtr->tabHeight = fontMetrics.tmHeight + 2*VERTICAL_ITEM_PADDING +  
+   * Make sure there is enough space for the letters + growing the
+   * selected item + extra space for the selected item.
+   */
+  infoPtr->tabHeight = fontMetrics.tmHeight + 2*VERTICAL_ITEM_PADDING +
                        SELECTED_TAB_OFFSET;
 
@@ -1634 +1635 @@
     for (iItem = 0; iItem < infoPtr->uNumItem; iItem++) {
       if (infoPtr->items[iItem].pszText)
-        COMCTL32_Free (infoPtr->items[iItem].pszText);
+        COMCTL32_Free (infoPtr->items[iItem].pszText);
     }
     COMCTL32_Free (infoPtr->items);
   }
-  
-  if (infoPtr->hwndToolTip) 
+
+  if (infoPtr->hwndToolTip)
     DestroyWindow (infoPtr->hwndToolTip);
- 
+
   if (infoPtr->hwndUpDown)
     DestroyWindow(infoPtr->hwndUpDown);
@@ -1656 +1657 @@
     case TCM_GETIMAGELIST:
       return TAB_GetImageList (hwnd, wParam, lParam);
-      
+
     case TCM_SETIMAGELIST:
       return TAB_SetImageList (hwnd, wParam, lParam);
-      
+
     case TCM_GETITEMCOUNT:
       return TAB_GetItemCount (hwnd, wParam, lParam);
-      
+
     case TCM_GETITEMA:
       return TAB_GetItemA (hwnd, wParam, lParam);
-      
+
     case TCM_GETITEMW:
 //      FIXME (tab, "Unimplemented msg TCM_GETITEMW\n");
       return 0;
-      
+
     case TCM_SETITEMA:
       return TAB_SetItemA (hwnd, wParam, lParam);
-      
+
     case TCM_SETITEMW:
 //      FIXME (tab, "Unimplemented msg TCM_SETITEMW\n");
       return 0;
-      
+
     case TCM_DELETEITEM:
       return TAB_DeleteItem (hwnd, wParam, lParam);
-      
+
     case TCM_DELETEALLITEMS:
      return TAB_DeleteAllItems (hwnd, wParam, lParam);
-     
+
     case TCM_GETITEMRECT:
      return TAB_GetItemRect (hwnd, wParam, lParam);
-      
+
     case TCM_GETCURSEL:
       return TAB_GetCurSel (hwnd);
-      
+
     case TCM_HITTEST:
       return TAB_HitTest (hwnd, wParam, lParam);
-      
+
     case TCM_SETCURSEL:
       return TAB_SetCurSel (hwnd, wParam);
-      
+
     case TCM_INSERTITEMA:
       return TAB_InsertItem (hwnd, wParam, lParam);
-      
+
     case TCM_INSERTITEMW:
 //      FIXME (tab, "Unimplemented msg TCM_INSERTITEM32W\n");
       return 0;
-      
+
     case TCM_SETITEMEXTRA:
 //      FIXME (tab, "Unimplemented msg TCM_SETITEMEXTRA\n");
       return 0;
-      
+
     case TCM_ADJUSTRECT:
       return TAB_AdjustRect (hwnd, (BOOL)wParam, (LPRECT)lParam);
-      
+
     case TCM_SETITEMSIZE:
       return TAB_SetItemSize (hwnd, wParam, lParam);
-      
+
     case TCM_REMOVEIMAGE:
 //      FIXME (tab, "Unimplemented msg TCM_REMOVEIMAGE\n");
       return 0;
-      
+
     case TCM_SETPADDING:
 //      FIXME (tab, "Unimplemented msg TCM_SETPADDING\n");
       return 0;
-      
+
     case TCM_GETROWCOUNT:
 //      FIXME (tab, "Unimplemented msg TCM_GETROWCOUNT\n");
@@ -1735 +1736 @@
 //      FIXME (tab, "Unimplemented msg TCM_HIGHLIGHTITEM\n");
       return 0;
-      
+
     case TCM_GETTOOLTIPS:
       return TAB_GetToolTips (hwnd, wParam, lParam);
-      
+
     case TCM_SETTOOLTIPS:
       return TAB_SetToolTips (hwnd, wParam, lParam);
-      
+
     case TCM_GETCURFOCUS:
       return TAB_GetCurFocus (hwnd);
-      
+
     case TCM_SETCURFOCUS:
       return TAB_SetCurFocus (hwnd, wParam);
-      
+
     case TCM_SETMINTTABWIDTH:
 //      FIXME (tab, "Unimplemented msg TCM_SETMINTTABWIDTH\n");
       return 0;
-      
+
     case TCM_DESELECTALL:
 //      FIXME (tab, "Unimplemented msg TCM_DESELECTALL\n");
       return 0;
-      
+
     case TCM_GETEXTENDEDSTYLE:
 //      FIXME (tab, "Unimplemented msg TCM_GETEXTENDEDSTYLE\n");
@@ -1766 +1767 @@
     case WM_GETFONT:
       return TAB_GetFont (hwnd, wParam, lParam);
-      
+
     case WM_SETFONT:
       return TAB_SetFont (hwnd, wParam, lParam);
-      
+
     case WM_CREATE:
       return TAB_Create (hwnd, wParam, lParam);
-      
+
     case WM_NCDESTROY:
       return TAB_Destroy (hwnd, wParam, lParam);
-      
+
     case WM_GETDLGCODE:
       return DLGC_WANTARROWS | DLGC_WANTCHARS;
-      
+
     case WM_LBUTTONDOWN:
       return TAB_LButtonDown (hwnd, wParam, lParam);
-      
+
     case WM_LBUTTONUP:
       return TAB_LButtonUp (hwnd, wParam, lParam);
-      
+
     case WM_RBUTTONDOWN:
       return TAB_RButtonDown (hwnd, wParam, lParam);
-      
+
     case WM_MOUSEMOVE:
       return TAB_MouseMove (hwnd, wParam, lParam);
-      
+
     case WM_ERASEBKGND:
       return TAB_EraseBackground (hwnd, (HDC)wParam);
@@ -1799 +1800 @@
     case WM_SIZE:
       return TAB_Size (hwnd, wParam, lParam);
-      
+
     case WM_SETREDRAW:
       return TAB_SetRedraw (hwnd, wParam);
@@ -1805 +1806 @@
     case WM_HSCROLL:
       return TAB_OnHScroll(hwnd, (int)LOWORD(wParam), (int)HIWORD(wParam), (HWND)lParam);
-      
+
     case WM_KILLFOCUS:
     case WM_SETFOCUS:
@@ -1815 +1816 @@
     default:
 //      if (uMsg >= WM_USER)
-//      ERR (tab, "unknown msg %04x wp=%08x lp=%08lx\n",
-//           uMsg, wParam, lParam);
+//      ERR (tab, "unknown msg %04x wp=%08x lp=%08lx\n",
+//           uMsg, wParam, lParam);
       return DefWindowProcA (hwnd, uMsg, wParam, lParam);
     }
@@ -1839 +1840 @@
   wndClass.hbrBackground = (HBRUSH)NULL;
   wndClass.lpszClassName = WC_TABCONTROLA;
-  
+
   RegisterClassA (&wndClass);
 }