Mercurial > dwindows
diff win/dw.c @ 328:e00aff2b899e
Tree item handles are now of the type HTREEITEM instead of HWND since they
were rarely actually window handles.
author | bsmith@81767d24-ef19-dc11-ae90-00e081727c95 |
---|---|
date | Tue, 08 Apr 2003 17:47:31 +0000 |
parents | be76b984620a |
children | 7b0f00729a32 |
line wrap: on
line diff
--- a/win/dw.c Tue Apr 08 09:36:02 2003 +0000 +++ b/win/dw.c Tue Apr 08 17:47:31 2003 +0000 @@ -1531,7 +1531,7 @@ tvi.hItem = hti; TreeView_GetItem(tmp->window, &tvi); - dw_tree_item_select(tmp->window, (HWND)hti); + dw_tree_item_select(tmp->window, hti); ptrs = (void **)tvi.lParam; @@ -5725,7 +5725,7 @@ * parent: Parent handle or 0 if root. * itemdata: Item specific data. */ -HWND API dw_tree_insert_after(HWND handle, HWND item, char *title, unsigned long icon, HWND parent, void *itemdata) +HTREEITEM API dw_tree_insert_after(HWND handle, HTREEITEM item, char *title, unsigned long icon, HTREEITEM parent, void *itemdata) { TVITEM tvi; TVINSERTSTRUCT tvins; @@ -5742,12 +5742,12 @@ tvi.iSelectedImage = tvi.iImage = _lookup_icon(handle, (HICON)icon, 1); tvins.item = tvi; - tvins.hParent = (HTREEITEM)parent; - tvins.hInsertAfter = item ? (HTREEITEM)item : TVI_FIRST; + tvins.hParent = parent; + tvins.hInsertAfter = item ? item : TVI_FIRST; hti = TreeView_InsertItem(handle, &tvins); - return (HWND)hti; + return hti; } /* @@ -5759,7 +5759,7 @@ * parent: Parent handle or 0 if root. * itemdata: Item specific data. */ -HWND API dw_tree_insert(HWND handle, char *title, unsigned long icon, HWND parent, void *itemdata) +HTREEITEM API dw_tree_insert(HWND handle, char *title, unsigned long icon, HTREEITEM parent, void *itemdata) { TVITEM tvi; TVINSERTSTRUCT tvins; @@ -5776,12 +5776,12 @@ tvi.iSelectedImage = tvi.iImage = _lookup_icon(handle, (HICON)icon, 1); tvins.item = tvi; - tvins.hParent = (HTREEITEM)parent; + tvins.hParent = parent; tvins.hInsertAfter = TVI_LAST; hti = TreeView_InsertItem(handle, &tvins); - return (HWND)hti; + return hti; } /* @@ -5792,13 +5792,13 @@ * title: The text title of the entry. * icon: Handle to coresponding icon. */ -void API dw_tree_set(HWND handle, HWND item, char *title, unsigned long icon) +void API dw_tree_set(HWND handle, HTREEITEM item, char *title, unsigned long icon) { TVITEM tvi; void **ptrs; tvi.mask = TVIF_HANDLE; - tvi.hItem = (HTREEITEM)item; + tvi.hItem = item; if(TreeView_GetItem(handle, &tvi)) { @@ -5823,13 +5823,13 @@ * item: Handle of the item to be modified. * itemdata: User defined data to be associated with item. */ -void API dw_tree_set_data(HWND handle, HWND item, void *itemdata) +void API dw_tree_set_data(HWND handle, HTREEITEM item, void *itemdata) { TVITEM tvi; void **ptrs; tvi.mask = TVIF_HANDLE; - tvi.hItem = (HTREEITEM)item; + tvi.hItem = item; if(TreeView_GetItem(handle, &tvi)) { @@ -5844,13 +5844,13 @@ * handle: Handle to the tree containing the item. * item: Handle of the item to be modified. */ -void * API dw_tree_get_data(HWND handle, HWND item) +void * API dw_tree_get_data(HWND handle, HTREEITEM item) { TVITEM tvi; void **ptrs; tvi.mask = TVIF_HANDLE; - tvi.hItem = (HTREEITEM)item; + tvi.hItem = item; if(TreeView_GetItem(handle, &tvi)) { @@ -5866,10 +5866,10 @@ * handle: Handle to the tree window (widget) to be selected. * item: Handle to the item to be selected. */ -void API dw_tree_item_select(HWND handle, HWND item) +void API dw_tree_item_select(HWND handle, HTREEITEM item) { dw_window_set_data(handle, "_dw_select_item", (void *)1); - TreeView_SelectItem(handle, (HTREEITEM)item); + TreeView_SelectItem(handle, item); dw_window_set_data(handle, "_dw_select_item", (void *)0); } @@ -5885,7 +5885,7 @@ HTREEITEM lastitem = hti; hti = TreeView_GetNextSibling(handle, hti); - dw_tree_delete(handle, (HWND)lastitem); + dw_tree_delete(handle, lastitem); } } @@ -5904,7 +5904,7 @@ _dw_tree_delete_recursive(handle, hti); hti = TreeView_GetNextSibling(handle, hti); - dw_tree_delete(handle, (HWND)lastitem); + dw_tree_delete(handle, lastitem); } } @@ -5914,9 +5914,9 @@ * handle: Handle to the tree window (widget). * item: Handle to node to be expanded. */ -void API dw_tree_expand(HWND handle, HWND item) -{ - TreeView_Expand(handle, (HTREEITEM)item, TVE_EXPAND); +void API dw_tree_expand(HWND handle, HTREEITEM item) +{ + TreeView_Expand(handle, item, TVE_EXPAND); } /* @@ -5925,9 +5925,9 @@ * handle: Handle to the tree window (widget). * item: Handle to node to be collapsed. */ -void API dw_tree_collapse(HWND handle, HWND item) -{ - TreeView_Expand(handle, (HTREEITEM)item, TVE_COLLAPSE); +void API dw_tree_collapse(HWND handle, HTREEITEM item) +{ + TreeView_Expand(handle, item, TVE_COLLAPSE); } /* @@ -5936,22 +5936,22 @@ * handle: Handle to the window (widget) to be cleared. * item: Handle to node to be deleted. */ -void API dw_tree_delete(HWND handle, HWND item) +void API dw_tree_delete(HWND handle, HTREEITEM item) { TVITEM tvi; void **ptrs; - if((HTREEITEM)item == TVI_ROOT || !item) + if(item == TVI_ROOT || !item) return; tvi.mask = TVIF_HANDLE; - tvi.hItem = (HTREEITEM)item; + tvi.hItem = item; if(TreeView_GetItem(handle, &tvi)) ptrs = (void **)tvi.lParam; - _dw_tree_delete_recursive(handle, (HTREEITEM)item); - TreeView_DeleteItem(handle, (HTREEITEM)item); + _dw_tree_delete_recursive(handle, item); + TreeView_DeleteItem(handle, item); if(ptrs) free(ptrs); }