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

Timestamp:

Sep 26, 1999, 1:01:11 PM (26 years ago)

Author:

achimha

Message:

merged latest WINE 990923 changes

File:

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

trunk/src/comctl32/tab.c

@@ -1 @@
-/* $Id: tab.c,v 1.12 1999-08-28 09:25:56 achimha Exp $ */
+/* $Id: tab.c,v 1.13 1999-09-26 11:01:11 achimha Exp $ */
 /*
  * Tab control
@@ -15 +15 @@
  */
 
-/* WINE 990815 level */
+/* WINE 990823 level */
 
 #include <string.h>
@@ -130 +130 @@
   INT iItem=(INT) wParam;
 
-  if ((iItem < 0) || (iItem > infoPtr->uNumItem)) return 0;
+  if ((iItem < 0) || (iItem >= infoPtr->uNumItem)) return 0;
 
   infoPtr->uFocus=iItem;
@@ -1301 +1301 @@
     infoPtr->items = COMCTL32_Alloc (sizeof (TAB_ITEM));
     infoPtr->uNumItem++;
+    infoPtr->iSelected = 0;
   }
   else {
@@ -1320 +1321 @@
 
     }
+
+    if (iItem <= infoPtr->iSelected)
+      infoPtr->iSelected++;
 
     COMCTL32_Free (oldItems);
@@ -1530 +1534 @@
   tabItem=(LPTCITEMA) lParam;
 //  TRACE (tab,"\n");
-  if ((iItem<0) || (iItem>infoPtr->uNumItem)) return FALSE;
+  if ((iItem<0) || (iItem>=infoPtr->uNumItem)) return FALSE;
 
   wineItem=& infoPtr->items[iItem];
@@ -1616 +1620 @@
       infoPtr->iSelected--;
 
+    if (infoPtr->uNumItem == 0)
+      infoPtr->iSelected = -1;
+
     /*
      * Reposition and repaint tabs.
@@ -1634 +1641 @@
 
   COMCTL32_Free (infoPtr->items);
-  infoPtr->uNumItem=0;
+  infoPtr->uNumItem = 0;
+  infoPtr->iSelected = -1;
 
   return TRUE;
@@ -1747 +1755 @@
   infoPtr->items           = 0;
   infoPtr->hcurArrow       = LoadCursorA (0, IDC_ARROWA);
-  infoPtr->iSelected       = 0;
+  infoPtr->iSelected       = -1;
   infoPtr->uFocus          = 0;
   infoPtr->hwndToolTip     = 0;