2
0
Эх сурвалжийг харах

* fix typing of some macro2procedure conversions. Mantis #21696

git-svn-id: trunk@20781 -
marco 13 жил өмнө
parent
commit
a9e189ca31

+ 8 - 8
packages/winunits-base/src/commctrl.pp

@@ -6565,11 +6565,11 @@ CONST
          TVM_GETITEMSTATE               = (TV_FIRST + 39);
 
 // Macro 211
-Function TreeView_GetItemState( hwndTV : hwnd; hti : WPARAM; mask : LPARAM):UINT;
+Function TreeView_GetItemState( hwndTV : hwnd; hti : HTreeItem; statemask : UINT):UINT;
 
 
 // Macro 212
-Function TreeView_GetCheckState( hwndTV : hwnd; hti : WPARAM):UINT;
+Function TreeView_GetCheckState( hwndTV : hwnd; hti : HTreeItem):UINT;
 
 
 CONST
@@ -10920,6 +10920,7 @@ end;
 //   SNDMSG((hwndLV), LVM_SETITEMSTATE, (WPARAM)(i), (LPARAM)(LV_ITEM *)&_ms_lvi);\
 // }
 
+
 Procedure ListView_SetItemState(hwndLV :hwnd; i :cint ;data,mask:UINT);
 
 Var _ms_lvi : LV_ITEM;
@@ -12437,27 +12438,26 @@ end;
 
 
 {$ifdef IE5plus}
+
 // Macro 211
 
 //#define TreeView_GetItemState(hwndTV, hti, mask) \
 //    (UINT)SNDMSG((hwndTV), TVM_GETITEMSTATE, (WPARAM)(hti), (LPARAM)(mask))
 
-Function TreeView_GetItemState( hwndTV : hwnd; hti : WPARAM; mask : LPARAM):UINT;
+Function TreeView_GetItemState( hwndTV : hwnd; hti : HTreeItem; statemask : UINT):UINT;
 
 Begin
- Result:=UINT(SendMessage((hwndTV), TVM_GETITEMSTATE, hti, mask))
+ Result:=UINT(SendMessage((hwndTV), TVM_GETITEMSTATE, WPARAM(hti), LPARAM(statemask)))
 end;
 
-
-
 // Macro 212
 // #define TreeView_GetCheckState(hwndTV, hti) \
 //    ((((UINT)(SNDMSG((hwndTV), TVM_GETITEMSTATE, (WPARAM)(hti), TVIS_STATEIMAGEMASK))) >> 12) -1)
 
-Function TreeView_GetCheckState( hwndTV : hwnd; hti : WPARAM):UINT;
+Function TreeView_GetCheckState( hwndTV : hwnd; hti : HTreeItem):UINT;
 
 Begin
- Result:=((UINT(SendMessage((hwndTV), TVM_GETITEMSTATE, hti, TVIS_STATEIMAGEMASK) shr 12) -1));
+ Result:=((UINT(SendMessage((hwndTV), TVM_GETITEMSTATE, wparam(hti), TVIS_STATEIMAGEMASK) shr 12) -1));
 end;