# HG changeset patch # User bsmith@81767d24-ef19-dc11-ae90-00e081727c95 # Date 1078811932 0 # Node ID 7755599311d44757cf2caafb139016bbe96c0a4a # Parent 8eb10e61027097d1d13caf0b6ee36ac944e79e58 Fixes search and replace errors. diff -r 8eb10e610270 -r 7755599311d4 dw.def --- a/dw.def Tue Mar 09 03:58:54 2004 +0000 +++ b/dw.def Tue Mar 09 05:58:52 2004 +0000 @@ -37,7 +37,7 @@ dw_window_set_font @54 dw_window_set_color @55 dw_window_set_pos @56 - dw_window_set_size @57 + dw_window_set_size @57 dw_window_set_pos_size @58 dw_window_get_pos_size @59 dw_window_set_style @60 @@ -54,7 +54,7 @@ dw_window_from_id @71 dw_window_set_border @72 dw_window_minimize @73 - dw_window_set_pointer @74 + dw_window_set_pointer @74 dw_window_default @75 dw_window_raise @76 dw_window_lower @77 @@ -84,37 +84,37 @@ dw_listbox_set_top @144 dw_listbox_select @145 dw_listbox_delete @146 - dw_listbox_get_text @147 + dw_listbox_get_text @147 dw_listbox_set_text @148 dw_listbox_selected @149 dw_listbox_selected_multi @150 dw_percent_new @160 - dw_percent_get_range @161 + dw_percent_get_range @161 dw_percent_set_pos @162 dw_mle_new @170 dw_mle_import @171 dw_mle_export @172 - dw_mle_get_size @173 + dw_mle_get_size @173 dw_mle_delete @174 dw_mle_clear @175 dw_mle_freeze @176 dw_mle_thaw @177 - dw_mle_set_cursor @178 - dw_mle_set_cursor_visible @179 + dw_mle_set_cursor @178 + dw_mle_set_visible @179 dw_mle_search @180 - dw_mle_set_cursor_editable @181 - dw_mle_set_cursor_word_wrap @182 + dw_mle_set_editable @181 + dw_mle_set_word_wrap @182 dw_spinbutton_new @190 dw_spinbutton_set_pos @191 dw_spinbutton_set_limits @192 dw_entryfield_set_limit @193 - dw_spinbutton_get_pos @194 + dw_spinbutton_get_pos @194 dw_checkbox_new @200 - dw_checkbox_get @201 + dw_checkbox_get @201 dw_checkbox_set @202 dw_icon_load @210 @@ -159,7 +159,7 @@ dw_notebook_page_set_text @273 dw_notebook_page_set_status_text @274 dw_notebook_page_set @275 - dw_notebook_page_get @276 + dw_notebook_page_get @276 dw_notebook_pack @277 dw_menu_new @280 @@ -214,21 +214,21 @@ dw_tree_new @370 dw_tree_insert @371 dw_tree_clear @372 - dw_tree_item_delete @373 - dw_tree_item_change @374 - dw_tree_item_expand @375 - dw_tree_item_collapse @376 + dw_tree_item_delete @373 + dw_tree_item_change @374 + dw_tree_item_expand @375 + dw_tree_item_collapse @376 dw_tree_item_select @377 - dw_tree_item_change_data @378 + dw_tree_item_set_data @378 dw_tree_insert_after @379 - dw_tree_item_get_data @380 + dw_tree_item_get_data @380 dw_tree_get_title @381 dw_tree_get_parent @382 dw_font_text_extents @385 dw_slider_new @390 - dw_slider_get_pos @391 + dw_slider_get_pos @391 dw_slider_set_pos @392 dw_window_set_data @400 @@ -243,7 +243,7 @@ dw_module_close @422 dw_scrollbar_new @430 - dw_scrollbar_get_pos @431 + dw_scrollbar_get_pos @431 dw_scrollbar_set_pos @432 dw_scrollbar_set_range @433 diff -r 8eb10e610270 -r 7755599311d4 dw.h --- a/dw.h Tue Mar 09 03:58:54 2004 +0000 +++ b/dw.h Tue Mar 09 05:58:52 2004 +0000 @@ -964,9 +964,9 @@ void API dw_mle_freeze(HWND handle); void API dw_mle_thaw(HWND handle); void API dw_mle_set_cursor(HWND handle, int point); -void API dw_mle_set_cursor_visible(HWND handle, int line); -void API dw_mle_set_cursor_editable(HWND handle, int state); -void API dw_mle_set_cursor_word_wrap(HWND handle, int state); +void API dw_mle_set_visible(HWND handle, int line); +void API dw_mle_set_editable(HWND handle, int state); +void API dw_mle_set_word_wrap(HWND handle, int state); int API dw_mle_search(HWND handle, char *text, int point, unsigned long flags); void API dw_spinbutton_set_pos(HWND handle, long position); void API dw_spinbutton_set_limits(HWND handle, long upper, long lower); @@ -982,7 +982,7 @@ void API dw_tree_item_expand(HWND handle, HTREEITEM item); void API dw_tree_item_collapse(HWND handle, HTREEITEM item); void API dw_tree_item_select(HWND handle, HTREEITEM item); -void API dw_tree_item_change_data(HWND handle, HTREEITEM item, void *itemdata); +void API dw_tree_item_set_data(HWND handle, HTREEITEM item, void *itemdata); void * API dw_tree_item_get_data(HWND handle, HTREEITEM item); char * API dw_tree_get_title(HWND handle, HTREEITEM item); HTREEITEM API dw_tree_get_parent(HWND handle, HTREEITEM item); diff -r 8eb10e610270 -r 7755599311d4 dww.def --- a/dww.def Tue Mar 09 03:58:54 2004 +0000 +++ b/dww.def Tue Mar 09 05:58:52 2004 +0000 @@ -34,7 +34,7 @@ dw_window_set_font @54 dw_window_set_color @55 dw_window_set_pos @56 - dw_window_set_size @57 + dw_window_set_size @57 dw_window_set_pos_size @58 dw_window_get_pos_size @59 dw_window_set_style @60 @@ -51,7 +51,7 @@ dw_window_from_id @71 dw_window_set_border @72 dw_window_minimize @73 - dw_window_set_pointer @74 + dw_window_set_pointer @74 dw_window_default @75 dw_window_raise @76 dw_window_lower @77 @@ -81,37 +81,37 @@ dw_listbox_set_top @144 dw_listbox_select @145 dw_listbox_delete @146 - dw_listbox_get_text @147 + dw_listbox_get_text @147 dw_listbox_set_text @148 dw_listbox_selected @149 dw_listbox_selected_multi @150 dw_percent_new @160 - dw_percent_get_range @161 + dw_percent_get_range @161 dw_percent_set_pos @162 dw_mle_new @170 dw_mle_import @171 dw_mle_export @172 - dw_mle_get_size @173 + dw_mle_get_size @173 dw_mle_delete @174 dw_mle_clear @175 dw_mle_freeze @176 dw_mle_thaw @177 - dw_mle_set_cursor @178 - dw_mle_set_cursor_visible @179 + dw_mle_set_cursor @178 + dw_mle_set_visible @179 dw_mle_search @180 - dw_mle_set_cursor_editable @181 - dw_mle_set_cursor_word_wrap @182 + dw_mle_set_editable @181 + dw_mle_set_word_wrap @182 dw_spinbutton_new @190 dw_spinbutton_set_pos @191 dw_spinbutton_set_limits @192 dw_entryfield_set_limit @193 - dw_spinbutton_get_pos @194 + dw_spinbutton_get_pos @194 dw_checkbox_new @200 - dw_checkbox_get @201 + dw_checkbox_get @201 dw_checkbox_set @202 dw_icon_load @210 @@ -156,7 +156,7 @@ dw_notebook_page_set_text @273 dw_notebook_page_set_status_text @274 dw_notebook_page_set @275 - dw_notebook_page_get @276 + dw_notebook_page_get @276 dw_notebook_pack @277 dw_menu_new @280 @@ -211,21 +211,21 @@ dw_tree_new @370 dw_tree_insert @371 dw_tree_clear @372 - dw_tree_item_delete @373 - dw_tree_item_change @374 - dw_tree_item_expand @375 - dw_tree_item_collapse @376 + dw_tree_item_delete @373 + dw_tree_item_change @374 + dw_tree_item_expand @375 + dw_tree_item_collapse @376 dw_tree_item_select @377 - dw_tree_item_change_data @378 + dw_tree_item_set_data @378 dw_tree_insert_after @379 - dw_tree_item_get_data @380 + dw_tree_item_get_data @380 dw_tree_get_title @381 dw_tree_get_parent @382 dw_font_text_extents @385 dw_slider_new @390 - dw_slider_get_pos @391 + dw_slider_get_pos @391 dw_slider_set_pos @392 dw_window_set_data @400 @@ -240,7 +240,7 @@ dw_module_close @422 dw_scrollbar_new @430 - dw_scrollbar_get_pos @431 + dw_scrollbar_get_pos @431 dw_scrollbar_set_pos @432 dw_scrollbar_set_range @433 diff -r 8eb10e610270 -r 7755599311d4 gtk/dw.c --- a/gtk/dw.c Tue Mar 09 03:58:54 2004 +0000 +++ b/gtk/dw.c Tue Mar 09 05:58:52 2004 +0000 @@ -3352,7 +3352,7 @@ * handle: Handle to the MLE. * line: Line to be visible. */ -void dw_mle_set_cursor_visible(HWND handle, int line) +void dw_mle_set_visible(HWND handle, int line) { int _locked_by_me = FALSE; @@ -3414,7 +3414,7 @@ * handle: Handle to the MLE. * state: TRUE if it can be edited, FALSE for readonly. */ -void dw_mle_set_cursor_editable(HWND handle, int state) +void dw_mle_set_editable(HWND handle, int state) { int _locked_by_me = FALSE; @@ -3445,7 +3445,7 @@ * handle: Handle to the MLE. * state: TRUE if it wraps, FALSE if it doesn't. */ -void dw_mle_set_cursor_word_wrap(HWND handle, int state) +void dw_mle_set_word_wrap(HWND handle, int state) { int _locked_by_me = FALSE; @@ -4281,7 +4281,7 @@ * item: Handle of the item to be modified. * itemdata: User defined data to be associated with item. */ -void dw_tree_item_change_data(HWND handle, HTREEITEM item, void *itemdata) +void dw_tree_item_set_data(HWND handle, HTREEITEM item, void *itemdata) { #if GTK_MAJOR_VERSION > 1 GtkWidget *tree; @@ -7935,7 +7935,7 @@ { item = dw_tree_insert(tree, dent->d_name, 0, parent, (void *)parent); tempitem = dw_tree_insert(tree, "", 0, item, 0); - dw_tree_item_change_data(tree, item, (void *)tempitem); + dw_tree_item_set_data(tree, item, (void *)tempitem); } free(folder); @@ -8020,7 +8020,7 @@ { char *folder = _tree_folder(tree, item); - dw_tree_item_change_data(tree, item, 0); + dw_tree_item_set_data(tree, item, 0); if(*folder) _populate_directory(tree, item, folder); @@ -8092,7 +8092,7 @@ item = dw_tree_insert(tree, "/", 0, NULL, 0); tempitem = dw_tree_insert(tree, "", 0, item, 0); - dw_tree_item_change_data(tree, item, (void *)tempitem); + dw_tree_item_set_data(tree, item, (void *)tempitem); dw_window_set_size(window, 225, 300); dw_window_show(window); diff -r 8eb10e610270 -r 7755599311d4 mac/dw.c --- a/mac/dw.c Tue Mar 09 03:58:54 2004 +0000 +++ b/mac/dw.c Tue Mar 09 05:58:52 2004 +0000 @@ -1807,7 +1807,7 @@ * handle: Handle to the MLE to be positioned. * line: Line to be visible. */ -void API dw_mle_set_cursor_visible(HWND handle, int line) +void API dw_mle_set_visible(HWND handle, int line) { } @@ -1817,7 +1817,7 @@ * handle: Handle to the MLE. * state: TRUE if it can be edited, FALSE for readonly. */ -void API dw_mle_set_cursor_editable(HWND handle, int state) +void API dw_mle_set_editable(HWND handle, int state) { } @@ -1827,7 +1827,7 @@ * handle: Handle to the MLE. * state: TRUE if it wraps, FALSE if it doesn't. */ -void API dw_mle_set_cursor_word_wrap(HWND handle, int state) +void API dw_mle_set_word_wrap(HWND handle, int state) { } @@ -2053,7 +2053,7 @@ * item: Handle of the item to be modified. * itemdata: User defined data to be associated with item. */ -void API dw_tree_item_change_data(HWND handle, HTREEITEM item, void *itemdata) +void API dw_tree_item_set_data(HWND handle, HTREEITEM item, void *itemdata) { } diff -r 8eb10e610270 -r 7755599311d4 os2/dw.c --- a/os2/dw.c Tue Mar 09 03:58:54 2004 +0000 +++ b/os2/dw.c Tue Mar 09 05:58:52 2004 +0000 @@ -5729,7 +5729,7 @@ * handle: Handle to the MLE to be positioned. * line: Line to be visible. */ -void API dw_mle_set_cursor_visible(HWND handle, int line) +void API dw_mle_set_visible(HWND handle, int line) { int tmppnt = (int)WinSendMsg(handle, MLM_CHARFROMLINE, MPFROMLONG(line), 0); WinSendMsg(handle, MLM_SETSEL, MPFROMLONG(tmppnt), MPFROMLONG(tmppnt)); @@ -5741,7 +5741,7 @@ * handle: Handle to the MLE. * state: TRUE if it can be edited, FALSE for readonly. */ -void API dw_mle_set_cursor_editable(HWND handle, int state) +void API dw_mle_set_editable(HWND handle, int state) { WinSendMsg(handle, MLM_SETREADONLY, MPFROMLONG(state ? FALSE : TRUE), 0); } @@ -5752,7 +5752,7 @@ * handle: Handle to the MLE. * state: TRUE if it wraps, FALSE if it doesn't. */ -void API dw_mle_set_cursor_word_wrap(HWND handle, int state) +void API dw_mle_set_word_wrap(HWND handle, int state) { WinSendMsg(handle, MLM_SETWRAP, MPFROMLONG(state), 0); } @@ -6104,7 +6104,7 @@ * item: Handle of the item to be modified. * itemdata: User defined data to be associated with item. */ -void API dw_tree_item_change_data(HWND handle, HTREEITEM item, void *itemdata) +void API dw_tree_item_set_data(HWND handle, HTREEITEM item, void *itemdata) { PCNRITEM pci = (PCNRITEM)item; @@ -8219,7 +8219,7 @@ item = dw_tree_insert(tree, ffbuf.achName, WinLoadFileIcon(folder, TRUE), parent, (void *)parent); tempitem = dw_tree_insert(tree, "", 0, item, 0); - dw_tree_item_change_data(tree, item, (void *)tempitem); + dw_tree_item_set_data(tree, item, (void *)tempitem); } } DosFindClose(hdir); @@ -8248,7 +8248,7 @@ items[drive] = dw_tree_insert(tree, name, WinLoadFileIcon(folder, TRUE), NULL, 0); tempitem = dw_tree_insert(tree, "", 0, items[drive], 0); - dw_tree_item_change_data(tree, items[drive], (void *)tempitem); + dw_tree_item_set_data(tree, items[drive], (void *)tempitem); } else items[drive] = 0; @@ -8342,7 +8342,7 @@ { char *folder = _tree_folder(window, item); - dw_tree_item_change_data(window, item, 0); + dw_tree_item_set_data(window, item, 0); dw_tree_item_delete(window, tempitem); if(*folder) diff -r 8eb10e610270 -r 7755599311d4 win/dw.c --- a/win/dw.c Tue Mar 09 03:58:54 2004 +0000 +++ b/win/dw.c Tue Mar 09 05:58:52 2004 +0000 @@ -5766,7 +5766,7 @@ * handle: Handle to the MLE. * line: Line to be visible. */ -void API dw_mle_set_cursor_visible(HWND handle, int line) +void API dw_mle_set_visible(HWND handle, int line) { int point = (int)SendMessage(handle, EM_LINEINDEX, (WPARAM)line, 0); dw_mle_set_cursor(handle, point); @@ -5778,7 +5778,7 @@ * handle: Handle to the MLE. * state: TRUE if it can be edited, FALSE for readonly. */ -void API dw_mle_set_cursor_editable(HWND handle, int state) +void API dw_mle_set_editable(HWND handle, int state) { SendMessage(handle, EM_SETREADONLY, (WPARAM)(state ? FALSE : TRUE), 0); } @@ -5789,7 +5789,7 @@ * handle: Handle to the MLE. * state: TRUE if it wraps, FALSE if it doesn't. */ -void API dw_mle_set_cursor_word_wrap(HWND handle, int state) +void API dw_mle_set_word_wrap(HWND handle, int state) { /* If ES_AUTOHSCROLL is not set and there is not * horizontal scrollbar it word wraps. @@ -6188,7 +6188,7 @@ * item: Handle of the item to be modified. * itemdata: User defined data to be associated with item. */ -void API dw_tree_item_change_data(HWND handle, HTREEITEM item, void *itemdata) +void API dw_tree_item_set_data(HWND handle, HTREEITEM item, void *itemdata) { TVITEM tvi; void **ptrs;