Changeset 3409 for trunk/src/comctl32/header.cpp

Timestamp:

Apr 16, 2000, 8:26:59 PM (25 years ago)

Author:

cbratschi

Message:

new listview messages and styles, new resources

File:

• trunk/src/comctl32/header.cpp (modified) (22 diffs)

trunk/src/comctl32/header.cpp

@@ -1 @@
-/* $Id: header.cpp,v 1.6 2000-04-15 14:22:15 cbratschi Exp $ */
+/* $Id: header.cpp,v 1.7 2000-04-16 18:26:57 cbratschi Exp $ */
 /*
  *  Header control
@@ -8 +8 @@
  *
  *  TODO:
- *   - Control specific cursors (over dividers)
- *
  *   - HDS_FILTERBAR
  *   - HEADER_SetHotDivider()
@@ -596 +594 @@
               *pFlags |= HHT_ONHEADER;
               *pItem = iCount;
-//                      TRACE (header, "ON HEADER %d\n", iCount);
+
               return;
             }
@@ -609 +607 @@
                   *pFlags |= HHT_ONDIVOPEN;
                   *pItem = iCount - 1;
-//                              TRACE (header, "ON DIVOPEN %d\n", *pItem);
+
                   return;
                 } else
@@ -615 +613 @@
                   *pFlags |= HHT_ONDIVIDER;
                   *pItem = iCount - 1;
-//                              TRACE (header, "ON DIVIDER %d\n", *pItem);
+
                   return;
                 }
@@ -626 +624 @@
               *pFlags |= HHT_ONDIVIDER;
               *pItem = iCount;
-//                      TRACE (header, "ON DIVIDER %d\n", *pItem);
+
               return;
             }
@@ -632 +630 @@
             *pFlags |= HHT_ONHEADER;
             *pItem = iCount;
-//                  TRACE (header, "ON HEADER %d\n", iCount);
+
             return;
           }
@@ -648 +646 @@
             *pFlags |= HHT_ONDIVOPEN;
             *pItem = infoPtr->uNumItem - 1;
-//                  TRACE (header, "ON DIVOPEN %d\n", *pItem);
+
             return;
           } else
@@ -654 +652 @@
             *pFlags |= HHT_ONDIVIDER;
             *pItem = infoPtr->uNumItem-1;
-//                  TRACE (header, "ON DIVIDER %d\n", *pItem);
+
             return;
           }
@@ -661 +659 @@
         *pFlags |= HHT_NOWHERE;
         *pItem = 1;
-//          TRACE (header, "NOWHERE\n");
+
         return;
       }
@@ -668 +666 @@
       if (lpPt->x < rect.left)
       {
-//         TRACE (header, "TO LEFT\n");
         *pFlags |= HHT_TOLEFT;
       } else if (lpPt->x > rect.right)
       {
-//          TRACE (header, "TO LEFT\n");
         *pFlags |= HHT_TORIGHT;
       }
@@ -678 +674 @@
       if (lpPt->y < rect.top)
       {
-//          TRACE (header, "ABOVE\n");
         *pFlags |= HHT_ABOVE;
       } else if (lpPt->y > rect.bottom)
       {
-//          TRACE (header, "BELOW\n");
         *pFlags |= HHT_BELOW;
       }
@@ -688 +682 @@
 
     *pItem = 1;
-//    TRACE (header, "flags=0x%X\n", *pFlags);
+
     return;
 }
@@ -973 +967 @@
     HDC hdc;
 
-//    TRACE(header, "[iItem=%d]\n", iItem);
-
     if ((iItem < 0) || (iItem >= (INT)infoPtr->uNumItem)) return FALSE;
 
@@ -989 +981 @@
     {
       HEADER_ITEM *oldItems = infoPtr->items;
-//        TRACE(header, "Complex delete! [iItem=%d]\n", iItem);
 
       if (infoPtr->items[iItem].pszText) COMCTL32_Free(infoPtr->items[iItem].pszText);
@@ -1408 +1399 @@
     lpLayout->pwpos->flags = SWP_NOZORDER;
 
-//    TRACE (header, "Layout x=%d y=%d cx=%d cy=%d\n",
-//           lpLayout->pwpos->x, lpLayout->pwpos->y,
-//           lpLayout->pwpos->cx, lpLayout->pwpos->cy);
-
     return TRUE;
 }
@@ -1539 +1526 @@
     infoPtr->hFont = 0;
     infoPtr->items = 0;
-    infoPtr->hcurArrow = LoadCursorA (0, IDC_ARROWA);
-    infoPtr->hcurDivider = LoadCursorA (0, IDC_SIZEWEA);
-    infoPtr->hcurDivopen = LoadCursorA (0, IDC_SIZENSA);
+    infoPtr->hcurArrow = LoadCursorA(0,IDC_ARROWA);
+    infoPtr->hcurDivider = LoadCursorA(COMCTL32_hModule,MAKEINTRESOURCEA(IDC_COMCTL32_DRAGHLINE));
+    infoPtr->hcurDivopen = LoadCursorA(COMCTL32_hModule,MAKEINTRESOURCEA(IDC_COMCTL32_SPLITHLINE));
     infoPtr->bCaptured = FALSE;
     infoPtr->bPressed  = FALSE;
@@ -1659 +1646 @@
         ReleaseDC (hwnd, hdc);
 
-//      TRACE (header, "Pressed item %d!\n", nItem);
     } else if ((flags == HHT_ONDIVIDER) || (flags == HHT_ONDIVOPEN))
     {
@@ -1680 +1666 @@
             }
 
-//          TRACE (header, "Begin tracking item %d!\n", nItem);
         }
     }
@@ -1883 +1868 @@
           }
         }
-//          TRACE (header, "Moving pressed item %d!\n", infoPtr->iMoveItem);
       } else if (infoPtr->bTracking)
       {
@@ -2083 +2067 @@
     INT   nItem;
 
-//    TRACE (header, "code=0x%X  id=0x%X\n", LOWORD(lParam), HIWORD(lParam));
-
     GetCursorPos (&pt);
     ScreenToClient (hwnd, &pt);
@@ -2263 +2245 @@
 
         default:
-//            if (msg >= WM_USER)
-//              ERR (header, "unknown msg %04x wp=%04x lp=%08lx\n",
-//                   msg, wParam, lParam );
+            //if (msg >= WM_USER)
+            //  ERR (header, "unknown msg %04x wp=%04x lp=%08lx\n",
+            //       msg, wParam, lParam );
             return defComCtl32ProcA (hwnd, msg, wParam, lParam);
     }