Changeset 288

Timestamp:

Jul 10, 1999, 7:16:44 PM (26 years ago)

Author:

achimha

Message:

ported latest comctl32 changes from WINE

Location:

trunk/include/win

Files:

• commctrl.h (modified) (3 diffs)
• toolbar.h (modified) (3 diffs)

trunk/include/win/commctrl.h ¶

@@ -1 @@
-/* $Id: commctrl.h,v 1.8 1999-07-07 16:48:25 achimha Exp $ */
+/* $Id: commctrl.h,v 1.9 1999-07-10 17:16:43 achimha Exp $ */
 /*
  * Common controls definitions
@@ -2537 +2537 @@
 typedef INT (*PFNLVCOMPARE)(LPARAM, LPARAM, LPARAM);
 
+#define ListView_GetNextItem(hwnd,nItem,flags) \
+    (INT)SendMessageA((hwnd),LVM_GETNEXTITEM,(WPARAM)(INT)(nItem),(LPARAM)(MAKELPARAM(flags,0)))
+#define ListView_FindItem(hwnd,nItem,plvfi) \
+    (INT)SendMessageA((hwnd),LVM_FINDITEMA,(WPARAM)(INT)(nItem),(LPARAM)(LVFINDINFO*)(plvfi))
 #define ListView_Arrange(hwnd,code) \
     (INT)SendMessageA((hwnd),LVM_ARRANGE,(WPARAM)(INT)(code),0L)
@@ -3072 +3076 @@
 
 #define DPAM_SORT               0x0001
-
-BOOL WINAPI DPA_Merge (const HDPA, const HDPA, DWORD, PFNDPACOMPARE, LPVOID, LPARAM);
+//typedef PVOID(CALLBACK *PFNDPAMERGE)(DWORD,PVOID,PVOID,LPARAM);
+typedef PVOID(*PFNDPAMERGE)(DWORD,PVOID,PVOID,LPARAM);
+BOOL WINAPI DPA_Merge (const HDPA, const HDPA, DWORD, PFNDPACOMPARE, PFNDPAMERGE, LPARAM);
 
 //typedef INT (CALLBACK *DPAENUMPROC)(LPVOID, DWORD);

trunk/include/win/toolbar.h ¶

@@ -1 @@
-/* $Id: toolbar.h,v 1.2 1999-07-07 16:48:26 achimha Exp $ */
+/* $Id: toolbar.h,v 1.3 1999-07-10 17:16:44 achimha Exp $ */
 
 /*
@@ -55 +55 @@
     INT      nHotItem;        /* index of the "hot" item */
     HFONT    hFont;           /* text font */
-    HIMAGELIST himlStd;         /* standard image list for TB_ADDBITMAP command*/
+    HIMAGELIST himlInt;         /* image list created internally */
     HIMAGELIST himlDef;         /* default image list for TB_SETIMAGELIST*/
     HIMAGELIST himlHot;         /* hot image list */
@@ -72 +72 @@
     LPWSTR       *strings;      /* pointer to string array */
     //Customize dialog
-    HDSA hDsa;
     HWND hwndToolbar;
 } TOOLBAR_INFO;