Changeset 7170

Timestamp:

Oct 23, 2001, 7:03:49 PM (24 years ago)

Author:

sandervl

Message:

listview fixes

File:

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

trunk/src/comctl32/listview.c ¶

@@ -2657 +2657 @@
                  * SetItemFocus call.
                  */
+#ifdef __WIN32OS2__
+                //SvL: Allow focus change the first time (nFocusedItem set to -2
+                //     in WM_CREATE
+                if (infoPtr->nFocusedItem >= 0 || infoPtr->nFocusedItem == -2) {
+                   if(infoPtr->nFocusedItem == -2) infoPtr->nFocusedItem = -1;
+                   LISTVIEW_SetItemFocus(hwnd, lpLVItem->iItem);
+                }
+#else
                 if (infoPtr->nFocusedItem >= 0)
                   LISTVIEW_SetItemFocus(hwnd, lpLVItem->iItem);
+#endif
               }
             }
@@ -7877 +7886 @@
   /* set default values */
   infoPtr->uCallbackMask = 0;
+#ifdef __WIN32OS2__
+  infoPtr->nFocusedItem = -2;
+#else
   infoPtr->nFocusedItem = -1;
+#endif
   infoPtr->nSelectionMark = -1;
   infoPtr->nHotItem = -1;
@@ -8301 +8314 @@
   nmKeyDown.wVKey = nVirtualKey;
   nmKeyDown.flags = 0;
+#ifdef __WIN32OS2__
+  if(SendMessageA(hwndParent, WM_NOTIFY, (WPARAM)nCtrlId, (LPARAM)&nmKeyDown) == TRUE) 
+  {//application processed this key press
+      return 0;
+  }
+#else
   SendMessageA(hwndParent, WM_NOTIFY, (WPARAM)nCtrlId, (LPARAM)&nmKeyDown);
+#endif
 
   /* initialize */
@@ -8608 +8628 @@
     LISTVIEW_RemoveAllSelections(hwnd);
   }
+
+#ifdef __WIN32OS2__
+  //SvL: Send WM_COMMAND as well. (also done by NT's comctl32)
+  SendMessageA(GetParent(hwnd), WM_COMMAND, (1<<16) | nCtrlId, hwnd);
+#endif
 
   /* redraw if we could have possibly selected something */