Changeset 3285 for trunk/src/comctl32/listview.cpp

Timestamp:

Mar 31, 2000, 4:44:25 PM (25 years ago)

Author:

cbratschi

Message:

* empty log message *

File:

• trunk/src/comctl32/listview.cpp (modified) (11 diffs)

trunk/src/comctl32/listview.cpp

@@ -1 @@
-/*$Id: listview.cpp,v 1.9 2000-03-27 15:08:07 cbratschi Exp $*/
+/*$Id: listview.cpp,v 1.10 2000-03-31 14:44:20 cbratschi Exp $*/
 /*
  * Listview control
@@ -164 +164 @@
   if ((infoPtr->uView == LVS_REPORT) && !(infoPtr->dwStyle & LVS_NOCOLUMNHEADER))
   {
-    LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO*)LISTVIEW_GetInfoPtr(hwnd);
     RECT rect,rect2;
 
@@ -3557 +3556 @@
 static LRESULT LISTVIEW_GetExtendedListViewStyle(HWND hwnd)
 {
-    LISTVIEW_INFO *infoPtr;
+    LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)LISTVIEW_GetInfoPtr(hwnd);
+
     /* make sure we can get the listview info */
-    if (!(infoPtr = (LISTVIEW_INFO *)LISTVIEW_GetInfoPtr(hwnd)))
-        return (0);
+    if (!infoPtr)
+      return (0);
     return (infoPtr->dwExStyle);
 }
@@ -4039 +4039 @@
 static LRESULT LISTVIEW_GetHotItem(HWND hwnd)
 {
-    LISTVIEW_INFO *infoPtr;
+    LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)LISTVIEW_GetInfoPtr(hwnd);
+
     /* make sure we can get the listview info */
-    if (!(infoPtr = (LISTVIEW_INFO *)LISTVIEW_GetInfoPtr(hwnd)))
-        return (-1);
+    if (!infoPtr)
+      return (-1);
     return (infoPtr->nHotItem);
 }
@@ -5495 +5496 @@
 static LRESULT LISTVIEW_SetColumnWidth(HWND hwnd, INT iCol, INT cx)
 {
-    LISTVIEW_INFO *infoPtr;
+    LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)LISTVIEW_GetInfoPtr(hwnd);
     HDITEMA hdi;
     LRESULT lret;
+
+    // make sure we can get the listview info
+    if (!infoPtr)
+        return (FALSE);
 
     // set column width only if in report mode
@@ -5503 +5508 @@
         return (FALSE);
 
-    // make sure we can get the listview info
-    if (!(infoPtr = (LISTVIEW_INFO *)LISTVIEW_GetInfoPtr(hwnd)))
-        return (FALSE);
     if (!infoPtr->hwndHeader) // make sure we have a header
         return (FALSE);
@@ -5542 +5544 @@
 static LRESULT LISTVIEW_SetExtendedListViewStyle(HWND hwnd, DWORD dwMask, DWORD dwStyle)
 {
-    LISTVIEW_INFO *infoPtr;
+    LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)LISTVIEW_GetInfoPtr(hwnd);
     DWORD dwOldStyle;
+
     /* make sure we can get the listview info */
-    if (!(infoPtr = (LISTVIEW_INFO *)LISTVIEW_GetInfoPtr(hwnd)))
-        return (0);
+    if (!infoPtr)
+      return (0);
     /* store previous style */
     dwOldStyle = infoPtr->dwExStyle;
@@ -5570 +5573 @@
 static LRESULT LISTVIEW_SetHotItem(HWND hwnd, INT iIndex)
 {
-    LISTVIEW_INFO *infoPtr;
+    LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)LISTVIEW_GetInfoPtr(hwnd);
     INT iOldIndex;
+
     /* make sure we can get the listview info */
-    if (!(infoPtr = (LISTVIEW_INFO *)LISTVIEW_GetInfoPtr(hwnd)))
+    if (!infoPtr)
         return (-1);
     /* store previous index */
@@ -5926 +5930 @@
   LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)LISTVIEW_GetInfoPtr(hwnd);
   INT nOldIndex = infoPtr->nSelectionMark;
+
   infoPtr->nSelectionMark = nIndex;
   return nOldIndex;
@@ -7542 +7547 @@
 static LRESULT LISTVIEW_Command(HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
+    LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)LISTVIEW_GetInfoPtr(hwnd);
+
     switch (HIWORD(wParam))
     {
@@ -7550 +7557 @@
              */
             char buffer[1024];
-            LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)LISTVIEW_GetInfoPtr(hwnd);
             HDC           hdc      = GetDC(infoPtr->hwndEdit);
             HFONT         hFont, hOldFont = 0;