Authors: Paul Quinn <paulq@corel.ca>, Adrian Thurston <adriant@corel.ca>
- Changed LVM_SETITEMPOSITION -> LVM_SETITEMPOSITION32
          LVM_SETITEMPOSITION16 -> LVM_SETITEMPOSITION
- Added some missing structures and definitions to wingdi.h
- Added proper defines for GetCharWidthsXXX
- Added c++ protection to wingdi.h

diff --git a/include/commctrl.h b/include/commctrl.h
index 90b52cb..cb78489 100644
--- a/include/commctrl.h
+++ b/include/commctrl.h
@@ -2232,7 +2232,7 @@
 #define LVM_FINDITEMW         (LVM_FIRST+83)
 #define LVM_FINDITEM            WINELIB_NAME_AW(LVM_FINDITEM)
 #define LVM_GETITEMRECT         (LVM_FIRST+14)
-#define LVM_SETITEMPOSITION16     (LVM_FIRST+15)
+#define LVM_SETITEMPOSITION     (LVM_FIRST+15)
 #define LVM_GETITEMPOSITION     (LVM_FIRST+16)
 #define LVM_GETSTRINGWIDTHA   (LVM_FIRST+17)
 #define LVM_GETSTRINGWIDTHW   (LVM_FIRST+87)
@@ -2280,7 +2280,7 @@
 #define LVM_SETITEMTEXT         WINELIB_NAME_AW(LVM_SETITEMTEXT)
 #define LVM_SETITEMCOUNT        (LVM_FIRST+47)
 #define LVM_SORTITEMS           (LVM_FIRST+48)
-#define LVM_SETITEMPOSITION   (LVM_FIRST+49)
+#define LVM_SETITEMPOSITION32   (LVM_FIRST+49)
 #define LVM_GETSELECTEDCOUNT    (LVM_FIRST+50)
 #define LVM_GETITEMSPACING      (LVM_FIRST+51)
 #define LVM_GETISEARCHSTRINGA (LVM_FIRST+52)
@@ -2552,7 +2552,7 @@
 #define ListView_SortItems(hwndLV,_pfnCompare,_lPrm) \
     (BOOL)SendMessageA((hwndLV),LVM_SORTITEMS,(WPARAM)(LPARAM)_lPrm,(LPARAM)(PFNLVCOMPARE)_pfnCompare)
 #define ListView_SetItemPosition(hwndLV, i, x, y) \
-    (BOOL)SendMessageA((hwndLV),LVM_SETITEMPOSITION16,(WPARAM)(INT)(i),MAKELPARAM((x),(y)))
+    (BOOL)SendMessageA((hwndLV),LVM_SETITEMPOSITION,(WPARAM)(INT)(i),MAKELPARAM((x),(y)))
 #define ListView_GetSelectedCount(hwndLV) \
     (UINT)SendMessageA((hwndLV),LVM_GETSELECTEDCOUNT,0,0L)