Changeset 2740 for trunk/src/comctl32/listview.c

Timestamp:

Feb 10, 2000, 7:51:19 PM (26 years ago)

Author:

cbratschi

Message:

added listview style, treeview rewrite started

File:

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

trunk/src/comctl32/listview.c

@@ -1 @@
-/*$Id: listview.c,v 1.21 2000-02-04 17:02:07 cbratschi Exp $*/
+/*$Id: listview.c,v 1.22 2000-02-10 18:51:17 cbratschi Exp $*/
 /*
  * Listview control
@@ -51 +51 @@
 #include "commctrl.h"
 #include "listview.h"
-#include "debugtools.h"
+//#include "debugtools.h"
 #include "comctl32.h"
 
@@ -329 +329 @@
   if ((LVS_TYPEMASK & lStyle) == LVS_EDITLABELS)
   {
-    FIXME("  LVS_EDITLABELS\n");
+    //FIXME("  LVS_EDITLABELS\n");
   }
 
   if ((LVS_TYPEMASK & lStyle) == LVS_NOLABELWRAP)
   {
-    FIXME("  LVS_NOLABELWRAP\n");
+    //FIXME("  LVS_NOLABELWRAP\n");
   }
 
   if ((LVS_TYPEMASK & lStyle) == LVS_NOSCROLL)
   {
-    FIXME("  LVS_NOSCROLL\n");
-  }
-
-  if ((LVS_TYPEMASK & lStyle) == LVS_NOSORTHEADER)
-  {
-    FIXME("  LVS_NOSORTHEADER\n");
+    //FIXME("  LVS_NOSCROLL\n");
   }
 
   if ((LVS_TYPEMASK & lStyle) == LVS_OWNERDRAWFIXED)
   {
-    FIXME("  LVS_OWNERDRAWFIXED\n");
+    //FIXME("  LVS_OWNERDRAWFIXED\n");
   }
 
   if ((LVS_TYPEMASK & lStyle) == LVS_SHAREIMAGELISTS)
   {
-    FIXME("  LVS_SHAREIMAGELISTS\n");
+    //FIXME("  LVS_SHAREIMAGELISTS\n");
   }
 
   if ((LVS_TYPEMASK & lStyle) == LVS_SORTASCENDING)
   {
-    FIXME("  LVS_SORTASCENDING\n");
+    //FIXME("  LVS_SORTASCENDING\n");
   }
 
   if ((LVS_TYPEMASK & lStyle) == LVS_SORTDESCENDING)
   {
-    FIXME("  LVS_SORTDESCENDING\n");
+    //FIXME("  LVS_SORTDESCENDING\n");
   }
 }
@@ -3561 +3556 @@
      )
     return FALSE;
+
   hdpaSubItems = (HDPA)DPA_GetPtr(infoPtr->hdpaItems, lpLVItem->iItem);
   if (hdpaSubItems == NULL)
     return FALSE;
+
   lpItem = (LISTVIEW_ITEM *)DPA_GetPtr(hdpaSubItems, 0);
   if (lpItem == NULL)
     return FALSE;
+
   ZeroMemory(&dispInfo, sizeof(NMLVDISPINFOA));
   if (lpLVItem->iSubItem == 0)
@@ -3640 +3638 @@
     }
   }
+
   if (lpLVItem->iSubItem == 0)
   {
@@ -3652 +3651 @@
       lpLVItem->state = lpItem->state & lpLVItem->stateMask;
     }
+
     if (lpLVItem->mask & LVIF_PARAM)
     {
       lpLVItem->lParam = lpItem->lParam;
     }
+
     if (lpLVItem->mask & LVIF_INDENT)
     {
@@ -3661 +3662 @@
     }
   }
+
   return TRUE;
 }
@@ -5717 +5719 @@
   UINT uView = lpcs->style & LVS_TYPEMASK;
   LOGFONTA logFont;
+  DWORD headerStyle = WS_CHILD | HDS_HORZ;
 
   /* initialize info pointer */
@@ -5751 +5754 @@
 
   /* create header */
+  if (!(lpcs->style & LVS_NOSORTHEADER)) headerStyle |= HDS_BUTTONS;
   infoPtr->hwndHeader = CreateWindowA(WC_HEADERA, (LPCSTR)NULL,
-                                      WS_CHILD | HDS_HORZ | HDS_BUTTONS,
+                                      headerStyle,
                                       0, 0, 0, 0, hwnd, (HMENU)0,
                                       lpcs->hInstance, NULL);
@@ -6475 +6479 @@
     if (infoPtr->notifyFormat == NFR_UNICODE)
     {
-      FIXME("NO support for unicode structures");
+      //FIXME("NO support for unicode structures");
     }
   }
@@ -6908 +6912 @@
         LISTVIEW_AlignTop(hwnd);
       }
+    }
+
+    if ((lpss->styleOld & LVS_NOSORTHEADER) != (lpss->styleNew & LVS_NOSORTHEADER))
+    {
+      INT headerStyle = GetWindowLongA(infoPtr->hwndHeader,GWL_STYLE);
+
+      if (lpss->styleNew & LVS_NOSORTHEADER)
+        headerStyle &= ~HDS_BUTTONS;
+      else
+        headerStyle |= HDS_BUTTONS;
+      SetWindowLongA(infoPtr->hwndHeader,GWL_STYLE,headerStyle);
     }