Mercurial > dwindows

comparison os2/dw.c @ 1769:d81bebc5c8cc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Mark and I decided to change dw_box_remove*() to dw_box_unpack*() for consistency. This commit should change all exports and references appropriately.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Fri, 06 Jul 2012 10:51:28 +0000
parents 31edce4598d0
children 0cdfb0c3f4ca
comparison
equal deleted inserted replaced
1768:227e13044ce3 1769:d81bebc5c8cc
4977 _free_menu_data(menu); 4977 _free_menu_data(menu);
4978 4978
4979 /* If it is a desktop window let WM_DESTROY handle it */ 4979 /* If it is a desktop window let WM_DESTROY handle it */
4980 if(parent != desktop) 4980 if(parent != desktop)
4981 { 4981 {
4982 dw_box_remove(handle); 4982 dw_box_unpack(handle);
4983 _free_window_memory(frame ? frame : handle); 4983 _free_window_memory(frame ? frame : handle);
4984 } 4984 }
4985 return WinDestroyWindow(frame ? frame : handle); 4985 return WinDestroyWindow(frame ? frame : handle);
4986 } 4986 }
4987 4987
7791 * Parameters: 7791 * Parameters:
7792 * handle: Window handle of the packed item to be removed. 7792 * handle: Window handle of the packed item to be removed.
7793 * Returns: 7793 * Returns:
7794 * DW_ERROR_NONE on success and DW_ERROR_GENERAL on failure. 7794 * DW_ERROR_NONE on success and DW_ERROR_GENERAL on failure.
7795 */ 7795 */
7796 int API dw_box_remove(HWND handle) 7796 int API dw_box_unpack(HWND handle)
7797 { 7797 {
7798 HWND parent = WinQueryWindow(handle, QW_PARENT); 7798 HWND parent = WinQueryWindow(handle, QW_PARENT);
7799 7799
7800 if(parent != desktop) 7800 if(parent != desktop)
7801 { 7801 {
7861 * box: Window handle of the box to be removed from. 7861 * box: Window handle of the box to be removed from.
7862 * index: 0 based index of packed items. 7862 * index: 0 based index of packed items.
7863 * Returns: 7863 * Returns:
7864 * Handle to the removed item on success, 0 on failure or padding. 7864 * Handle to the removed item on success, 0 on failure or padding.
7865 */ 7865 */
7866 HWND API dw_box_remove_at_index(HWND box, int index) 7866 HWND API dw_box_unpack_at_index(HWND box, int index)
7867 { 7867 {
7868 Box *thisbox = WinQueryWindowPtr(box, QWP_USER); 7868 Box *thisbox = WinQueryWindowPtr(box, QWP_USER);
7869 7869
7870 /* Try to remove it from the layout */ 7870 /* Try to remove it from the layout */
7871 if(thisbox && index > -1 && index < thisbox->count) 7871 if(thisbox && index > -1 && index < thisbox->count)