Mercurial > dwindows
comparison win/dw.c @ 1769:d81bebc5c8cc
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 | 47e503ecc812 |
children | 86ace55df07b |
comparison
equal
deleted
inserted
replaced
1768:227e13044ce3 | 1769:d81bebc5c8cc |
---|---|
4400 _free_menu_data(menu); | 4400 _free_menu_data(menu); |
4401 | 4401 |
4402 /* If it is a desktop window let WM_DESTROY handle it */ | 4402 /* If it is a desktop window let WM_DESTROY handle it */ |
4403 if(parent != HWND_DESKTOP) | 4403 if(parent != HWND_DESKTOP) |
4404 { | 4404 { |
4405 dw_box_remove(handle); | 4405 dw_box_unpack(handle); |
4406 _free_window_memory(handle, 0); | 4406 _free_window_memory(handle, 0); |
4407 EnumChildWindows(handle, _free_window_memory, 0); | 4407 EnumChildWindows(handle, _free_window_memory, 0); |
4408 } | 4408 } |
4409 return DestroyWindow(handle); | 4409 return DestroyWindow(handle); |
4410 } | 4410 } |
7185 * Parameters: | 7185 * Parameters: |
7186 * handle: Window handle of the packed item to be removed. | 7186 * handle: Window handle of the packed item to be removed. |
7187 * Returns: | 7187 * Returns: |
7188 * DW_ERROR_NONE on success and DW_ERROR_GENERAL on failure. | 7188 * DW_ERROR_NONE on success and DW_ERROR_GENERAL on failure. |
7189 */ | 7189 */ |
7190 int API dw_box_remove(HWND handle) | 7190 int API dw_box_unpack(HWND handle) |
7191 { | 7191 { |
7192 HWND parent = GetParent(handle); | 7192 HWND parent = GetParent(handle); |
7193 | 7193 |
7194 if(handle && parent != HWND_DESKTOP) | 7194 if(handle && parent != HWND_DESKTOP) |
7195 { | 7195 { |
7253 * box: Window handle of the box to be removed from. | 7253 * box: Window handle of the box to be removed from. |
7254 * index: 0 based index of packed items. | 7254 * index: 0 based index of packed items. |
7255 * Returns: | 7255 * Returns: |
7256 * Handle to the removed item on success, 0 on failure or padding. | 7256 * Handle to the removed item on success, 0 on failure or padding. |
7257 */ | 7257 */ |
7258 HWND API dw_box_remove_at_index(HWND box, int index) | 7258 HWND API dw_box_unpack_at_index(HWND box, int index) |
7259 { | 7259 { |
7260 Box *thisbox = (Box *)GetWindowLongPtr(box, GWLP_USERDATA); | 7260 Box *thisbox = (Box *)GetWindowLongPtr(box, GWLP_USERDATA); |
7261 | 7261 |
7262 /* Try to remove it from the layout */ | 7262 /* Try to remove it from the layout */ |
7263 if(thisbox && index > -1 && index < thisbox->count) | 7263 if(thisbox && index > -1 && index < thisbox->count) |