Changeset 6039 for trunk/src

Timestamp:

Jun 17, 2001, 11:07:13 PM (24 years ago)

Author:

sandervl

Message:

DT: datetime update + listview fix

Location:

trunk/src/comctl32

Files:

• datetime.c (modified) (4 diffs)
• listview.c (modified) (1 diff)

trunk/src/comctl32/datetime.c

@@ -168 +168 @@
 }
 
-
 static LRESULT
 DATETIME_GetMonthCalColor (HWND hwnd, WPARAM wParam)
@@ -1213 +1212 @@
 DATETIME_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
-#ifdef __WIN32OS2__
-    SYSTEMTIME *SyTiAr, *SyTiAr2;
-#endif
 
     if (!DATETIME_GetInfoPtr(hwnd) && (uMsg != WM_CREATE))
@@ -1224 +1220 @@
 
     case DTM_GETSYSTEMTIME:
-#ifdef __WIN32OS2__
-                return DATETIME_GetSystemTime (hwnd, wParam, lParam);
-#else
-                DATETIME_GetSystemTime (hwnd, wParam, lParam);
-#endif
+        return DATETIME_GetSystemTime (hwnd, wParam, lParam);
 
     case DTM_SETSYSTEMTIME:
-#ifdef __WIN32OS2__
-                return DATETIME_SetSystemTime (hwnd, wParam, lParam);
-#else
-                DATETIME_SetSystemTime (hwnd, wParam, lParam);
-#endif
+        return DATETIME_SetSystemTime (hwnd, wParam, lParam);
 
     case DTM_GETRANGE:
@@ -1340 +1328 @@
 }
 
+

trunk/src/comctl32/listview.c

@@ -5278 +5278 @@
 
   lpItem = (LISTVIEW_ITEM *)DPA_GetPtr(hdpaSubItems, 0);
+#ifdef __WIN32OS2__
+  if (lpItem == NULL || lpItem->iImage == -1) {
+    dprintf(("WARNING: lpItem (%x) INVALID", lpItem));
+    return FALSE;
+  }
+#else
   if (lpItem == NULL)
     return FALSE;
+#endif
 
   ZeroMemory(&dispInfo, sizeof(NMLVDISPINFOA));