# HG changeset patch
# User bsmith@81767d24-ef19-dc11-ae90-00e081727c95
# Date 1078802859 0
# Node ID 710f825982103c04aac808032e1d84fd45c541dd
# Parent  a9cfbc5ad01ed3541133ff39336d62b927dbf1e4
Change function names to be inline with Mark Hessling's Rexx/DW.

diff -r a9cfbc5ad01e -r 710f82598210 dw.def
--- a/dw.def	Mon Mar 08 03:46:17 2004 +0000
+++ b/dw.def	Tue Mar 09 03:27:39 2004 +0000
@@ -37,7 +37,7 @@
   dw_window_set_font                     @54
   dw_window_set_color                    @55
   dw_window_set_pos                      @56
-  dw_window_set_usize                    @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_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_query_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_query_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_query                           @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                             @178
-  dw_mle_set_visible                     @179
+  dw_mle_set_cursor                             @178
+  dw_mle_set_cursor_visible                     @179
   dw_mle_search                          @180
-  dw_mle_set_editable                    @181
-  dw_mle_set_word_wrap                   @182
+  dw_mle_set_cursor_editable                    @181
+  dw_mle_set_cursor_word_wrap                   @182
 
   dw_spinbutton_new                      @190
   dw_spinbutton_set_pos                  @191
   dw_spinbutton_set_limits               @192
   dw_entryfield_set_limit                @193
-  dw_spinbutton_query                    @194
+  dw_spinbutton_get_pos                    @194
 
   dw_checkbox_new                        @200
-  dw_checkbox_query                      @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_query                 @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_delete                         @373
-  dw_tree_set                            @374
-  dw_tree_expand                         @375
-  dw_tree_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_set_data                       @378
+  dw_tree_item_change_data                       @378
   dw_tree_insert_after                   @379
-  dw_tree_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_query_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_query_pos                 @431
+  dw_scrollbar_get_pos                 @431
   dw_scrollbar_set_pos                   @432
   dw_scrollbar_set_range                 @433
 
diff -r a9cfbc5ad01e -r 710f82598210 dw.h
--- a/dw.h	Mon Mar 08 03:46:17 2004 +0000
+++ b/dw.h	Tue Mar 09 03:27:39 2004 +0000
@@ -927,19 +927,19 @@
 void API dw_listbox_set_top(HWND handle, int top);
 void API dw_listbox_select(HWND handle, int index, int state);
 void API dw_listbox_delete(HWND handle, int index);
-void API dw_listbox_query_text(HWND handle, unsigned int index, char *buffer, unsigned int length);
+void API dw_listbox_get_text(HWND handle, unsigned int index, char *buffer, unsigned int length);
 void API dw_listbox_set_text(HWND handle, unsigned int index, char *buffer);
 unsigned int API dw_listbox_selected(HWND handle);
 int API dw_listbox_selected_multi(HWND handle, int where);
-unsigned int API dw_percent_query_range(HWND handle);
+unsigned int API dw_percent_get_range(HWND handle);
 void API dw_percent_set_pos(HWND handle, unsigned int position);
-unsigned int API dw_slider_query_pos(HWND handle);
+unsigned int API dw_slider_get_pos(HWND handle);
 void API dw_slider_set_pos(HWND handle, unsigned int position);
-unsigned int API dw_scrollbar_query_pos(HWND handle);
+unsigned int API dw_scrollbar_get_pos(HWND handle);
 void API dw_scrollbar_set_pos(HWND handle, unsigned int position);
 void API dw_scrollbar_set_range(HWND handle, unsigned int range, unsigned int visible);
 void API dw_window_set_pos(HWND handle, unsigned long x, unsigned long y);
-void API dw_window_set_usize(HWND handle, unsigned long width, unsigned long height);
+void API dw_window_set_size(HWND handle, unsigned long width, unsigned long height);
 void API dw_window_set_pos_size(HWND handle, unsigned long x, unsigned long y, unsigned long width, unsigned long height);
 void API dw_window_get_pos_size(HWND handle, unsigned long *x, unsigned long *y, unsigned long *width, unsigned long *height);
 void API dw_window_set_style(HWND handle, unsigned long style, unsigned long mask);
@@ -953,37 +953,37 @@
 void API dw_window_capture(HWND handle);
 void API dw_window_release(void);
 void API dw_window_reparent(HWND handle, HWND newparent);
-void API dw_window_pointer(HWND handle, int pointertype);
+void API dw_window_set_pointer(HWND handle, int pointertype);
 void API dw_window_default(HWND window, HWND defaultitem);
 void API dw_window_click_default(HWND window, HWND next);
 unsigned int API dw_mle_import(HWND handle, char *buffer, int startpoint);
 void API dw_mle_export(HWND handle, char *buffer, int startpoint, int length);
-void API dw_mle_query(HWND handle, unsigned long *bytes, unsigned long *lines);
+void API dw_mle_get_size(HWND handle, unsigned long *bytes, unsigned long *lines);
 void API dw_mle_delete(HWND handle, int startpoint, int length);
 void API dw_mle_clear(HWND handle);
 void API dw_mle_freeze(HWND handle);
 void API dw_mle_thaw(HWND handle);
-void API dw_mle_set(HWND handle, int point);
-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);
+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);
 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);
 void API dw_entryfield_set_limit(HWND handle, ULONG limit);
-long API dw_spinbutton_query(HWND handle);
-int API dw_checkbox_query(HWND handle);
+long API dw_spinbutton_get_pos(HWND handle);
+int API dw_checkbox_get(HWND handle);
 void API dw_checkbox_set(HWND handle, int value);
 HTREEITEM API dw_tree_insert(HWND handle, char *title, unsigned long icon, HTREEITEM parent, void *itemdata);
 HTREEITEM API dw_tree_insert_after(HWND handle, HTREEITEM item, char *title, unsigned long icon, HTREEITEM parent, void *itemdata);
 void API dw_tree_clear(HWND handle);
-void API dw_tree_delete(HWND handle, HTREEITEM item);
-void API dw_tree_set(HWND handle, HTREEITEM item, char *title, unsigned long icon);
-void API dw_tree_expand(HWND handle, HTREEITEM item);
-void API dw_tree_collapse(HWND handle, HTREEITEM item);
+void API dw_tree_item_delete(HWND handle, HTREEITEM item);
+void API dw_tree_item_change(HWND handle, HTREEITEM item, char *title, unsigned long icon);
+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_set_data(HWND handle, HTREEITEM item, void *itemdata);
-void * API dw_tree_get_data(HWND handle, HTREEITEM item);
+void API dw_tree_item_change_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);
 int API dw_container_setup(HWND handle, unsigned long *flags, char **titles, int count, int separator);
@@ -1022,7 +1022,7 @@
 void API dw_notebook_page_set_text(HWND handle, unsigned long pageid, char *text);
 void API dw_notebook_page_set_status_text(HWND handle, unsigned long pageid, char *text);
 void API dw_notebook_page_set(HWND handle, unsigned int pageid);
-unsigned long API dw_notebook_page_query(HWND handle);
+unsigned long API dw_notebook_page_get(HWND handle);
 void API dw_notebook_pack(HWND handle, unsigned long pageid, HWND page);
 HWND API dw_splitbar_new(int type, HWND topleft, HWND bottomright, unsigned long id);
 void API dw_splitbar_set(HWND handle, float percent);
diff -r a9cfbc5ad01e -r 710f82598210 dwtest.c
--- a/dwtest.c	Mon Mar 08 03:46:17 2004 +0000
+++ b/dwtest.c	Tue Mar 09 03:27:39 2004 +0000
@@ -285,13 +285,13 @@
 	if(cursor_arrow)
 	{
 		dw_window_set_text((HWND)cursortogglebutton,"Set Cursor pointer - ARROW");
-		dw_window_pointer((HWND)data,DW_POINTER_CLOCK);
+		dw_window_set_pointer((HWND)data,DW_POINTER_CLOCK);
 		cursor_arrow = 0;
 	}
 	else
 	{
 		dw_window_set_text((HWND)cursortogglebutton,"Set Cursor pointer - CLOCK");
-		dw_window_pointer((HWND)data,DW_POINTER_ARROW);
+		dw_window_set_pointer((HWND)data,DW_POINTER_ARROW);
 		cursor_arrow = 1;
 	}
 	return FALSE;
@@ -470,7 +470,7 @@
 		str = dw_container_query_next(container, DW_CRA_SELECTED);
 	}
 	/* Make the last inserted point the cursor location */
-	dw_mle_set(container_mle, mle_point);
+	dw_mle_set_cursor(container_mle, mle_point);
 /* set the details of item 0 to new data */
 fprintf(stderr,"In cb: container: %x containerinfo: %x icon: %x\n", (int)container, (int)containerinfo, (int)fileicon);
 	dw_filesystem_change_file(container, 0, "new data", fileicon);
@@ -670,9 +670,9 @@
 	t4 = dw_tree_insert(tree, "tree file 2", fileicon, t1, (void *)4 );
 	t5 = dw_tree_insert(tree, "tree file 3", fileicon, t2, (void *)5 );
 	t6 = dw_tree_insert(tree, "tree file 4", fileicon, t2, (void *)6 );
-	/* set the folder name and icon again to show error with dw_tree_set under GTK 2.0 */
-	dw_tree_set(tree, t1, "tree folder 1", foldericon );
-	dw_tree_set(tree, t2, "tree folder 2", foldericon );
+	/* set the folder name and icon again to show error with dw_tree_item_change under GTK 2.0 */
+	dw_tree_item_change(tree, t1, "tree folder 1", foldericon );
+	dw_tree_item_change(tree, t2, "tree folder 2", foldericon );
 }
 
 void container_add(void)
@@ -863,7 +863,7 @@
 	dw_signal_connect(mainwindow, DW_SIGNAL_DELETE, DW_SIGNAL_FUNC(exit_callback), (void *)mainwindow);
 	timerid = dw_timer_connect(1000, DW_SIGNAL_FUNC(timer_callback), 0);
 	dw_window_set_icon(mainwindow, fileicon);
-	dw_window_set_usize(mainwindow, 640, 480);
+	dw_window_set_size(mainwindow, 640, 480);
 	dw_window_show(mainwindow);
 
 	dw_main();
diff -r a9cfbc5ad01e -r 710f82598210 dww.def
--- a/dww.def	Mon Mar 08 03:46:17 2004 +0000
+++ b/dww.def	Tue Mar 09 03:27:39 2004 +0000
@@ -34,7 +34,7 @@
   dw_window_set_font                     @54
   dw_window_set_color                    @55
   dw_window_set_pos                      @56
-  dw_window_set_usize                    @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_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_query_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_query_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_query                           @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                             @178
-  dw_mle_set_visible                     @179
+  dw_mle_set_cursor                             @178
+  dw_mle_set_cursor_visible                     @179
   dw_mle_search                          @180
-  dw_mle_set_editable                    @181
-  dw_mle_set_word_wrap                   @182
+  dw_mle_set_cursor_editable                    @181
+  dw_mle_set_cursor_word_wrap                   @182
 
   dw_spinbutton_new                      @190
   dw_spinbutton_set_pos                  @191
   dw_spinbutton_set_limits               @192
   dw_entryfield_set_limit                @193
-  dw_spinbutton_query                    @194
+  dw_spinbutton_get_pos                    @194
 
   dw_checkbox_new                        @200
-  dw_checkbox_query                      @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_query                 @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_delete                         @373
-  dw_tree_set                            @374
-  dw_tree_expand                         @375
-  dw_tree_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_set_data                       @378
+  dw_tree_item_change_data                       @378
   dw_tree_insert_after                   @379
-  dw_tree_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_query_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_query_pos                 @431
+  dw_scrollbar_get_pos                 @431
   dw_scrollbar_set_pos                   @432
   dw_scrollbar_set_range                 @433
 
diff -r a9cfbc5ad01e -r 710f82598210 gtk/dw.c
--- a/gtk/dw.c	Mon Mar 08 03:46:17 2004 +0000
+++ b/gtk/dw.c	Tue Mar 09 03:27:39 2004 +0000
@@ -1805,7 +1805,7 @@
  *       handle: Handle to widget for which to change.
  *       cursortype: ID of the pointer you want.
  */
-void dw_window_pointer(HWND handle, int pointertype)
+void dw_window_set_pointer(HWND handle, int pointertype)
 {
 	int _locked_by_me = FALSE;
 	GdkCursor *cursor;
@@ -3206,7 +3206,7 @@
  *          bytes: A pointer to a variable to return the total bytes.
  *          lines: A pointer to a variable to return the number of lines.
  */
-void dw_mle_query(HWND handle, unsigned long *bytes, unsigned long *lines)
+void dw_mle_get_size(HWND handle, unsigned long *bytes, unsigned long *lines)
 {
 	int _locked_by_me = FALSE;
 
@@ -3352,7 +3352,7 @@
  *          handle: Handle to the MLE.
  *          line: Line to be visible.
  */
-void dw_mle_set_visible(HWND handle, int line)
+void dw_mle_set_cursor_visible(HWND handle, int line)
 {
 	int _locked_by_me = FALSE;
 
@@ -3392,7 +3392,7 @@
 			unsigned long lines;
 			float pos, ratio;
 
-			dw_mle_query(handle, NULL, &lines);
+			dw_mle_get_size(handle, NULL, &lines);
 
 			if(lines)
 			{
@@ -3414,7 +3414,7 @@
  *          handle: Handle to the MLE.
  *          state: TRUE if it can be edited, FALSE for readonly.
  */
-void dw_mle_set_editable(HWND handle, int state)
+void dw_mle_set_cursor_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_word_wrap(HWND handle, int state)
+void dw_mle_set_cursor_word_wrap(HWND handle, int state)
 {
 	int _locked_by_me = FALSE;
 
@@ -3479,7 +3479,7 @@
  *          handle: Handle to the MLE to be positioned.
  *          point: Point to position cursor.
  */
-void dw_mle_set(HWND handle, int point)
+void dw_mle_set_cursor(HWND handle, int point)
 {
 	int _locked_by_me = FALSE;
 
@@ -3518,7 +3518,7 @@
 			unsigned long chars;
 			float pos, ratio;
 
-			dw_mle_query(handle, &chars, NULL);
+			dw_mle_get_size(handle, &chars, NULL);
 
 			if(chars)
 			{
@@ -3665,7 +3665,7 @@
  * Parameters:
  *          handle: Handle to the percent bar to be queried.
  */
-unsigned int dw_percent_query_range(HWND handle)
+unsigned int dw_percent_get_range(HWND handle)
 {
 	return 100;
 }
@@ -3690,7 +3690,7 @@
  * Parameters:
  *          handle: Handle to the slider to be queried.
  */
-unsigned int dw_slider_query_pos(HWND handle)
+unsigned int dw_slider_get_pos(HWND handle)
 {
 	int val = 0, _locked_by_me = FALSE;
 	GtkAdjustment *adjustment;
@@ -3747,7 +3747,7 @@
  * Parameters:
  *          handle: Handle to the scrollbar to be queried.
  */
-unsigned int dw_scrollbar_query_pos(HWND handle)
+unsigned int dw_scrollbar_get_pos(HWND handle)
 {
 	int val = 0, _locked_by_me = FALSE;
 	GtkAdjustment *adjustment;
@@ -3837,7 +3837,7 @@
 	GtkAdjustment *adj;
 	int _locked_by_me = FALSE;
 
-	curval = dw_spinbutton_query(handle);
+	curval = dw_spinbutton_get_pos(handle);
 	DW_MUTEX_LOCK;
 	adj = (GtkAdjustment *)gtk_adjustment_new((gfloat)curval, (gfloat)lower, (gfloat)upper, 1.0, 5.0, 0.0);
 	gtk_spin_button_set_adjustment(GTK_SPIN_BUTTON(handle), adj);
@@ -3864,7 +3864,7 @@
  * Parameters:
  *          handle: Handle to the spinbutton to be queried.
  */
-long dw_spinbutton_query(HWND handle)
+long dw_spinbutton_get_pos(HWND handle)
 {
 	long retval;
 	int _locked_by_me = FALSE;
@@ -3881,7 +3881,7 @@
  * Parameters:
  *          handle: Handle to the checkbox to be queried.
  */
-int dw_checkbox_query(HWND handle)
+int dw_checkbox_get(HWND handle)
 {
 	int retval;
 	int _locked_by_me = FALSE;
@@ -3993,8 +3993,8 @@
 	gtk_widget_show(hbox);
 
 	{
-		void *thisfunc = (void *)gtk_object_get_data(GTK_OBJECT(tree), "_dw_tree_expand_func");
-		void *mydata = (void *)gtk_object_get_data(GTK_OBJECT(tree), "_dw_tree_expand_data");
+		void *thisfunc = (void *)gtk_object_get_data(GTK_OBJECT(tree), "_dw_tree_item_expand_func");
+		void *mydata = (void *)gtk_object_get_data(GTK_OBJECT(tree), "_dw_tree_item_expand_data");
 		SignalHandler work = _get_signal_handler(tree, mydata);
 
 		if(thisfunc && work.window)
@@ -4139,8 +4139,8 @@
 	gtk_widget_show(hbox);
 
 	{
-		void *thisfunc = (void *)gtk_object_get_data(GTK_OBJECT(tree), "_dw_tree_expand_func");
-		void *mydata = (void *)gtk_object_get_data(GTK_OBJECT(tree), "_dw_tree_expand_data");
+		void *thisfunc = (void *)gtk_object_get_data(GTK_OBJECT(tree), "_dw_tree_item_expand_func");
+		void *mydata = (void *)gtk_object_get_data(GTK_OBJECT(tree), "_dw_tree_item_expand_data");
 		SignalHandler work = _get_signal_handler(tree, mydata);
 
 		if(thisfunc && work.window)
@@ -4216,7 +4216,7 @@
  *          title: The text title of the entry.
  *          icon: Handle to coresponding icon.
  */
-void dw_tree_set(HWND handle, HTREEITEM item, char *title, unsigned long icon)
+void dw_tree_item_change(HWND handle, HTREEITEM item, char *title, unsigned long icon)
 {
 #if GTK_MAJOR_VERSION > 1
 	GtkWidget *tree;
@@ -4281,7 +4281,7 @@
  *          item: Handle of the item to be modified.
  *          itemdata: User defined data to be associated with item.
  */
-void dw_tree_set_data(HWND handle, HTREEITEM item, void *itemdata)
+void dw_tree_item_change_data(HWND handle, HTREEITEM item, void *itemdata)
 {
 #if GTK_MAJOR_VERSION > 1
 	GtkWidget *tree;
@@ -4386,7 +4386,7 @@
  *          handle: Handle to the tree containing the item.
  *          item: Handle of the item to be modified.
  */
-void *dw_tree_get_data(HWND handle, HTREEITEM item)
+void *dw_tree_item_get_data(HWND handle, HTREEITEM item)
 {
 	void *ret = NULL;
 #if GTK_MAJOR_VERSION > 1
@@ -4540,7 +4540,7 @@
  *       handle: Handle to the tree window (widget).
  *       item: Handle to node to be expanded.
  */
-void dw_tree_expand(HWND handle, HTREEITEM item)
+void dw_tree_item_expand(HWND handle, HTREEITEM item)
 {
 #if GTK_MAJOR_VERSION > 1
 	GtkWidget *tree;
@@ -4581,7 +4581,7 @@
  *       handle: Handle to the tree window (widget).
  *       item: Handle to node to be collapsed.
  */
-void dw_tree_collapse(HWND handle, HTREEITEM item)
+void dw_tree_item_collapse(HWND handle, HTREEITEM item)
 {
 #if GTK_MAJOR_VERSION > 1
 	GtkWidget *tree;
@@ -4620,7 +4620,7 @@
  *       handle: Handle to the window (widget) to be cleared.
  *       item: Handle to node to be deleted.
  */
-void dw_tree_delete(HWND handle, HTREEITEM item)
+void dw_tree_item_delete(HWND handle, HTREEITEM item)
 {
 #if GTK_MAJOR_VERSION > 1
 	GtkWidget *tree;
@@ -6605,7 +6605,7 @@
  *          width: New width in pixels.
  *          height: New height in pixels.
  */
-void dw_window_set_usize(HWND handle, unsigned long width, unsigned long height)
+void dw_window_set_size(HWND handle, unsigned long width, unsigned long height)
 {
 	int _locked_by_me = FALSE;
 
@@ -6706,7 +6706,7 @@
 	DW_MUTEX_LOCK;
 	if(GTK_IS_WINDOW(handle))
 	{
-		dw_window_set_usize(handle, width, height);
+		dw_window_set_size(handle, width, height);
 		gtk_widget_set_uposition(handle, x, y);
 	}
 	else if(handle->window)
@@ -6895,7 +6895,7 @@
  * Parameters:
  *          handle: Handle to the notebook widget.
  */
-unsigned long dw_notebook_page_query(HWND handle)
+unsigned long dw_notebook_page_get(HWND handle)
 {
 	int retval, phys;
 	int _locked_by_me = FALSE;
@@ -7211,7 +7211,7 @@
  *          buffer: Buffer where text will be copied.
  *          length: Length of the buffer (including NULL).
  */
-void dw_listbox_query_text(HWND handle, unsigned int index, char *buffer, unsigned int length)
+void dw_listbox_get_text(HWND handle, unsigned int index, char *buffer, unsigned int length)
 {
 	GtkWidget *handle2 = handle;
 	int _locked_by_me = FALSE;
@@ -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_set_data(tree, item, (void *)tempitem);
+					dw_tree_item_change_data(tree, item, (void *)tempitem);
 				}
 
 				free(folder);
@@ -8014,13 +8014,13 @@
 {
 	DWDialog *dwwait = (DWDialog *)data;
 	HWND tree = (HWND)dw_window_get_data((HWND)dwwait->data, "_dw_tree");
-	HTREEITEM tempitem = (HTREEITEM)dw_tree_get_data(tree, item);
+	HTREEITEM tempitem = (HTREEITEM)dw_tree_item_get_data(tree, item);
 
 	if(tempitem)
 	{
 		char *folder = _tree_folder(tree, item);
 
-		dw_tree_set_data(tree, item, 0);
+		dw_tree_item_change_data(tree, item, 0);
 
 		if(*folder)
 			_populate_directory(tree, item, folder);
@@ -8031,7 +8031,7 @@
 		 * it sits on ceases to be valid and attempts
 		 * to delete or recreate it fail horribly.
 		 */
-		dw_tree_delete(tree, tempitem);
+		dw_tree_item_delete(tree, tempitem);
 #endif
 		free(folder);
 	}
@@ -8092,9 +8092,9 @@
 
 		item = dw_tree_insert(tree, "/", 0, NULL, 0);
 		tempitem = dw_tree_insert(tree, "", 0, item, 0);
-		dw_tree_set_data(tree, item, (void *)tempitem);
-
-		dw_window_set_usize(window, 225, 300);
+		dw_tree_item_change_data(tree, item, (void *)tempitem);
+
+		dw_window_set_size(window, 225, 300);
 		dw_window_show(window);
 	}
 	else
@@ -8450,8 +8450,8 @@
 		if(thisfunc)
 		{
 			sigid = _set_signal_handler(thiswindow, window, sigfunc, data, thisfunc);
-			gtk_object_set_data(GTK_OBJECT(thiswindow), "_dw_tree_expand_func", (gpointer)thisfunc);
-			gtk_object_set_data(GTK_OBJECT(thiswindow), "_dw_tree_expand_data", (gpointer)sigid);
+			gtk_object_set_data(GTK_OBJECT(thiswindow), "_dw_tree_item_expand_func", (gpointer)thisfunc);
+			gtk_object_set_data(GTK_OBJECT(thiswindow), "_dw_tree_item_expand_data", (gpointer)sigid);
 		}
 		DW_MUTEX_UNLOCK;
 		return;
diff -r a9cfbc5ad01e -r 710f82598210 mac/dw.c
--- a/mac/dw.c	Mon Mar 08 03:46:17 2004 +0000
+++ b/mac/dw.c	Tue Mar 09 03:27:39 2004 +0000
@@ -520,7 +520,7 @@
 static int _dw_int_pos(HWND hwnd)
 {
 	int pos = (int)dw_window_get_data(hwnd, "_dw_percent_value");
-	int range = dw_percent_query_range(hwnd);
+	int range = dw_percent_get_range(hwnd);
 	float fpos = (float)pos;
 	float frange = (float)range;
 	float fnew = (fpos/1000.0)*frange;
@@ -529,7 +529,7 @@
 
 static void _dw_int_set(HWND hwnd, int pos)
 {
-	int inew, range = dw_percent_query_range(hwnd);
+	int inew, range = dw_percent_get_range(hwnd);
 	if(range)
 	{
 		float fpos = (float)pos;
@@ -933,7 +933,7 @@
  *       handle: Handle to widget for which to change.
  *       cursortype: ID of the pointer you want.
  */
-void API dw_window_pointer(HWND handle, int pointertype)
+void API dw_window_set_pointer(HWND handle, int pointertype)
 {
 	SetCursor(*GetCursor(pointertype));
 }
@@ -1488,7 +1488,7 @@
  *          width: New width in pixels.
  *          height: New height in pixels.
  */
-void API dw_window_set_usize(HWND handle, ULONG width, ULONG height)
+void API dw_window_set_size(HWND handle, ULONG width, ULONG height)
 {
         SizeWindow((WindowRef)handle, (short)width, (short)height, TRUE);
 }
@@ -1540,7 +1540,7 @@
 void API dw_window_set_pos_size(HWND handle, ULONG x, ULONG y, ULONG width, ULONG height)
 {
 	dw_window_set_pos(handle, x, y);
-	dw_window_set_usize(handle, width, height);
+	dw_window_set_size(handle, width, height);
 }
 
 /*
@@ -1594,7 +1594,7 @@
  * Parameters:
  *          handle: Handle to the notebook widget.
  */
-unsigned long API dw_notebook_page_query(HWND handle)
+unsigned long API dw_notebook_page_get(HWND handle)
 {
 	return 0;
 }
@@ -1689,7 +1689,7 @@
  *          buffer: Buffer where text will be copied.
  *          length: Length of the buffer (including NULL).
  */
-void API dw_listbox_query_text(HWND handle, unsigned int index, char *buffer, unsigned int length)
+void API dw_listbox_get_text(HWND handle, unsigned int index, char *buffer, unsigned int length)
 {
 }
 
@@ -1777,7 +1777,7 @@
  *          bytes: A pointer to a variable to return the total bytes.
  *          lines: A pointer to a variable to return the number of lines.
  */
-void API dw_mle_query(HWND handle, unsigned long *bytes, unsigned long *lines)
+void API dw_mle_get_size(HWND handle, unsigned long *bytes, unsigned long *lines)
 {
 }
 
@@ -1807,7 +1807,7 @@
  *          handle: Handle to the MLE to be positioned.
  *          line: Line to be visible.
  */
-void API dw_mle_set_visible(HWND handle, int line)
+void API dw_mle_set_cursor_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_editable(HWND handle, int state)
+void API dw_mle_set_cursor_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_word_wrap(HWND handle, int state)
+void API dw_mle_set_cursor_word_wrap(HWND handle, int state)
 {
 }
 
@@ -1837,7 +1837,7 @@
  *          handle: Handle to the MLE to be positioned.
  *          point: Point to position cursor.
  */
-void API dw_mle_set(HWND handle, int point)
+void API dw_mle_set_cursor(HWND handle, int point)
 {
 }
 
@@ -1877,7 +1877,7 @@
  * Parameters:
  *          handle: Handle to the percent bar to be queried.
  */
-unsigned int API dw_percent_query_range(HWND handle)
+unsigned int API dw_percent_get_range(HWND handle)
 {
 	return 0;
 }
@@ -1897,7 +1897,7 @@
  * Parameters:
  *          handle: Handle to the slider to be queried.
  */
-unsigned int API dw_slider_query_pos(HWND handle)
+unsigned int API dw_slider_get_pos(HWND handle)
 {
 	return 0;
 }
@@ -1917,7 +1917,7 @@
  * Parameters:
  *          handle: Handle to the scrollbar to be queried.
  */
-unsigned int API dw_scrollbar_query_pos(HWND handle)
+unsigned int API dw_scrollbar_get_pos(HWND handle)
 {
 	return 0;
 }
@@ -1980,7 +1980,7 @@
  * Parameters:
  *          handle: Handle to the spinbutton to be queried.
  */
-long API dw_spinbutton_query(HWND handle)
+long API dw_spinbutton_get_pos(HWND handle)
 {
     return 0;
 }
@@ -1990,7 +1990,7 @@
  * Parameters:
  *          handle: Handle to the checkbox to be queried.
  */
-int API dw_checkbox_query(HWND handle)
+int API dw_checkbox_get(HWND handle)
 {
 	return 0;
 }
@@ -2042,7 +2042,7 @@
  *          title: The text title of the entry.
  *          icon: Handle to coresponding icon.
  */
-void API dw_tree_set(HWND handle, HTREEITEM item, char *title, unsigned long icon)
+void API dw_tree_item_change(HWND handle, HTREEITEM item, char *title, unsigned long icon)
 {
 }
 
@@ -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_set_data(HWND handle, HTREEITEM item, void *itemdata)
+void API dw_tree_item_change_data(HWND handle, HTREEITEM item, void *itemdata)
 {
 }
 
@@ -2063,7 +2063,7 @@
  *          handle: Handle to the tree containing the item.
  *          item: Handle of the item to be modified.
  */
-void * API dw_tree_get_data(HWND handle, HTREEITEM item)
+void * API dw_tree_item_get_data(HWND handle, HTREEITEM item)
 {
 	return NULL;
 }
@@ -2093,7 +2093,7 @@
  *       handle: Handle to the tree window (widget).
  *       item: Handle to node to be expanded.
  */
-void API dw_tree_expand(HWND handle, HTREEITEM item)
+void API dw_tree_item_expand(HWND handle, HTREEITEM item)
 {
 }
 
@@ -2103,7 +2103,7 @@
  *       handle: Handle to the tree window (widget).
  *       item: Handle to node to be collapsed.
  */
-void API dw_tree_collapse(HWND handle, HTREEITEM item)
+void API dw_tree_item_collapse(HWND handle, HTREEITEM item)
 {
 }
 
@@ -2113,7 +2113,7 @@
  *       handle: Handle to the window (widget) to be cleared.
  *       item: Handle to node to be deleted.
  */
-void API dw_tree_delete(HWND handle, HTREEITEM item)
+void API dw_tree_item_delete(HWND handle, HTREEITEM item)
 {
 }
 
diff -r a9cfbc5ad01e -r 710f82598210 os2/dw.c
--- a/os2/dw.c	Mon Mar 08 03:46:17 2004 +0000
+++ b/os2/dw.c	Tue Mar 09 03:27:39 2004 +0000
@@ -542,7 +542,7 @@
 				{
 					Box *notebox;
 					HWND page = (HWND)WinSendMsg(box->items[z].hwnd, BKM_QUERYPAGEWINDOWHWND,
-												 (MPARAM)dw_notebook_page_query(box->items[z].hwnd), 0);
+												 (MPARAM)dw_notebook_page_get(box->items[z].hwnd), 0);
 
 					if(page)
 					{
@@ -670,7 +670,7 @@
 				{
 					Box *notebox;
 					HWND page = (HWND)WinSendMsg(box->items[z].hwnd, BKM_QUERYPAGEWINDOWHWND,
-												 (MPARAM)dw_notebook_page_query(box->items[z].hwnd), 0);
+												 (MPARAM)dw_notebook_page_get(box->items[z].hwnd), 0);
 
 					if(page)
 					{
@@ -1752,7 +1752,7 @@
 int _dw_int_pos(HWND hwnd)
 {
 	int pos = (int)dw_window_get_data(hwnd, "_dw_percent_value");
-	int range = dw_percent_query_range(hwnd);
+	int range = dw_percent_get_range(hwnd);
 	float fpos = (float)pos;
 	float frange = (float)range;
 	float fnew = (fpos/1000.0)*frange;
@@ -1761,7 +1761,7 @@
 
 void _dw_int_set(HWND hwnd, int pos)
 {
-	int inew, range = dw_percent_query_range(hwnd);
+	int inew, range = dw_percent_get_range(hwnd);
 	if(range)
 	{
 		float fpos = (float)pos;
@@ -1935,7 +1935,7 @@
 	if(which == SB_SLIDERTRACK)
 		return pos;
 
-	pos = dw_scrollbar_query_pos(handle);
+	pos = dw_scrollbar_get_pos(handle);
 	res = WinSendMsg(handle, SBM_QUERYRANGE, 0, 0);
 
 	min = SHORT1FROMMP(res);
@@ -2397,7 +2397,7 @@
 									char buf1[500];
 									unsigned int index = dw_listbox_selected(tmp->window);
 
-									dw_listbox_query_text(tmp->window, index, buf1, 500);
+									dw_listbox_get_text(tmp->window, index, buf1, 500);
 
 									_recursing = 1;
 
@@ -3824,7 +3824,7 @@
  *       handle: Handle to widget for which to change.
  *       cursortype: ID of the pointer you want.
  */
-void API dw_window_pointer(HWND handle, int pointertype)
+void API dw_window_set_pointer(HWND handle, int pointertype)
 {
 	if(handle == HWND_DESKTOP)
 		WinSetPointer(handle, WinQuerySysPointer(HWND_DESKTOP,pointertype, FALSE));
@@ -5267,7 +5267,7 @@
  *          width: New width in pixels.
  *          height: New height in pixels.
  */
-void API dw_window_set_usize(HWND handle, ULONG width, ULONG height)
+void API dw_window_set_size(HWND handle, ULONG width, ULONG height)
 {
 	WinSetWindowPos(handle, NULLHANDLE, 0, 0, width, height, SWP_SHOW | SWP_SIZE);
 }
@@ -5395,7 +5395,7 @@
  * Parameters:
  *          handle: Handle to the notebook widget.
  */
-unsigned long API dw_notebook_page_query(HWND handle)
+unsigned long API dw_notebook_page_get(HWND handle)
 {
 	return (unsigned long)WinSendMsg(handle, BKM_QUERYPAGEID,0L, MPFROM2SHORT(BKA_TOP, BKA_MAJOR));
 }
@@ -5512,7 +5512,7 @@
  *          buffer: Buffer where text will be copied.
  *          length: Length of the buffer (including NULL).
  */
-void API dw_listbox_query_text(HWND handle, unsigned int index, char *buffer, unsigned int length)
+void API dw_listbox_get_text(HWND handle, unsigned int index, char *buffer, unsigned int length)
 {
 	WinSendMsg(handle, LM_QUERYITEMTEXT, MPFROM2SHORT(index, length), (MPARAM)buffer);
 }
@@ -5679,7 +5679,7 @@
  *          bytes: A pointer to a variable to return the total bytes.
  *          lines: A pointer to a variable to return the number of lines.
  */
-void API dw_mle_query(HWND handle, unsigned long *bytes, unsigned long *lines)
+void API dw_mle_get_size(HWND handle, unsigned long *bytes, unsigned long *lines)
 {
 	if(bytes)
 		*bytes = (unsigned long)WinSendMsg(handle, MLM_QUERYTEXTLENGTH, 0, 0);
@@ -5719,7 +5719,7 @@
 {
 	unsigned long bytes;
 
-	dw_mle_query(handle, &bytes, NULL);
+	dw_mle_get_size(handle, &bytes, NULL);
 
 	WinSendMsg(handle, MLM_DELETE, MPFROMLONG(0), MPFROMLONG(bytes));
 }
@@ -5730,7 +5730,7 @@
  *          handle: Handle to the MLE to be positioned.
  *          line: Line to be visible.
  */
-void API dw_mle_set_visible(HWND handle, int line)
+void API dw_mle_set_cursor_visible(HWND handle, int line)
 {
 	int tmppnt = (int)WinSendMsg(handle, MLM_CHARFROMLINE, MPFROMLONG(line), 0);
 	WinSendMsg(handle, MLM_SETSEL, MPFROMLONG(tmppnt), MPFROMLONG(tmppnt));
@@ -5742,7 +5742,7 @@
  *          handle: Handle to the MLE.
  *          state: TRUE if it can be edited, FALSE for readonly.
  */
-void API dw_mle_set_editable(HWND handle, int state)
+void API dw_mle_set_cursor_editable(HWND handle, int state)
 {
 	WinSendMsg(handle, MLM_SETREADONLY, MPFROMLONG(state ? FALSE : TRUE), 0);
 }
@@ -5753,7 +5753,7 @@
  *          handle: Handle to the MLE.
  *          state: TRUE if it wraps, FALSE if it doesn't.
  */
-void API dw_mle_set_word_wrap(HWND handle, int state)
+void API dw_mle_set_cursor_word_wrap(HWND handle, int state)
 {
 	WinSendMsg(handle, MLM_SETWRAP, MPFROMLONG(state), 0);
 }
@@ -5764,7 +5764,7 @@
  *          handle: Handle to the MLE to be positioned.
  *          point: Point to position cursor.
  */
-void API dw_mle_set(HWND handle, int point)
+void API dw_mle_set_cursor(HWND handle, int point)
 {
 	WinSendMsg(handle, MLM_SETSEL, MPFROMLONG(point), MPFROMLONG(point));
 }
@@ -5822,7 +5822,7 @@
  * Parameters:
  *          handle: Handle to the percent bar to be queried.
  */
-unsigned int API dw_percent_query_range(HWND handle)
+unsigned int API dw_percent_get_range(HWND handle)
 {
 	return SHORT2FROMMP(WinSendMsg(handle, SLM_QUERYSLIDERINFO, MPFROM2SHORT(SMA_SLIDERARMPOSITION,SMA_RANGEVALUE), 0));
 }
@@ -5844,7 +5844,7 @@
  * Parameters:
  *          handle: Handle to the slider to be queried.
  */
-unsigned int API dw_slider_query_pos(HWND handle)
+unsigned int API dw_slider_get_pos(HWND handle)
 {
 	return (unsigned int)WinSendMsg(handle, SLM_QUERYSLIDERINFO, MPFROM2SHORT(SMA_SLIDERARMPOSITION, SMA_INCREMENTVALUE), 0);
 }
@@ -5866,7 +5866,7 @@
  * Parameters:
  *          handle: Handle to the scrollbar to be queried.
  */
-unsigned int API dw_scrollbar_query_pos(HWND handle)
+unsigned int API dw_scrollbar_get_pos(HWND handle)
 {
 	return (unsigned int)WinSendMsg(handle, SBM_QUERYPOS, 0, 0);
 }
@@ -5938,7 +5938,7 @@
  * Parameters:
  *          handle: Handle to the spinbutton to be queried.
  */
-long API dw_spinbutton_query(HWND handle)
+long API dw_spinbutton_get_pos(HWND handle)
 {
 	long tmpval = 0L;
 
@@ -5951,7 +5951,7 @@
  * Parameters:
  *          handle: Handle to the checkbox to be queried.
  */
-int API dw_checkbox_query(HWND handle)
+int API dw_checkbox_get(HWND handle)
 {
 	return (int)WinSendMsg(handle,BM_QUERYCHECK,0,0);
 }
@@ -6048,7 +6048,7 @@
  *          title: The text title of the entry.
  *          icon: Handle to coresponding icon.
  */
-void API dw_tree_set(HWND handle, HTREEITEM item, char *title, unsigned long icon)
+void API dw_tree_item_change(HWND handle, HTREEITEM item, char *title, unsigned long icon)
 {
 	PCNRITEM pci = (PCNRITEM)item;
 
@@ -6105,7 +6105,7 @@
  *          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, HTREEITEM item, void *itemdata)
+void API dw_tree_item_change_data(HWND handle, HTREEITEM item, void *itemdata)
 {
 	PCNRITEM pci = (PCNRITEM)item;
 
@@ -6122,7 +6122,7 @@
  *          handle: Handle to the tree containing the item.
  *          item: Handle of the item to be modified.
  */
-void * API dw_tree_get_data(HWND handle, HTREEITEM item)
+void * API dw_tree_item_get_data(HWND handle, HTREEITEM item)
 {
 	PCNRITEM pci = (PCNRITEM)item;
 
@@ -6169,7 +6169,7 @@
  *       handle: Handle to the tree window (widget).
  *       item: Handle to node to be expanded.
  */
-void API dw_tree_expand(HWND handle, HTREEITEM item)
+void API dw_tree_item_expand(HWND handle, HTREEITEM item)
 {
 	WinSendMsg(handle, CM_EXPANDTREE, MPFROMP(item), 0);
 }
@@ -6180,7 +6180,7 @@
  *       handle: Handle to the tree window (widget).
  *       item: Handle to node to be collapsed.
  */
-void API dw_tree_collapse(HWND handle, HTREEITEM item)
+void API dw_tree_item_collapse(HWND handle, HTREEITEM item)
 {
 	WinSendMsg(handle, CM_COLLAPSETREE, MPFROMP(item), 0);
 }
@@ -6191,7 +6191,7 @@
  *       handle: Handle to the window (widget) to be cleared.
  *       item: Handle to node to be deleted.
  */
-void API dw_tree_delete(HWND handle, HTREEITEM item)
+void API dw_tree_item_delete(HWND handle, HTREEITEM item)
 {
 	PCNRITEM     pci = (PCNRITEM)item;
 
@@ -8220,7 +8220,7 @@
 
 				item = dw_tree_insert(tree, ffbuf.achName, WinLoadFileIcon(folder, TRUE), parent, (void *)parent);
 				tempitem = dw_tree_insert(tree, "", 0, item, 0);
-				dw_tree_set_data(tree, item, (void *)tempitem);
+				dw_tree_item_change_data(tree, item, (void *)tempitem);
 			}
 		}
 		DosFindClose(hdir);
@@ -8249,7 +8249,7 @@
 
 			items[drive] = dw_tree_insert(tree, name, WinLoadFileIcon(folder, TRUE), NULL, 0);
 			tempitem = dw_tree_insert(tree, "", 0, items[drive], 0);
-			dw_tree_set_data(tree, items[drive], (void *)tempitem);
+			dw_tree_item_change_data(tree, items[drive], (void *)tempitem);
 		}
 		else
 			items[drive] = 0;
@@ -8336,15 +8336,15 @@
 
 int DWSIGNAL _tree_expand(HWND window, HTREEITEM item, void *data)
 {
-	HTREEITEM tempitem = (HTREEITEM)dw_tree_get_data(window, item);
+	HTREEITEM tempitem = (HTREEITEM)dw_tree_item_get_data(window, item);
 
 	data = data;
 	if(tempitem)
 	{
 		char *folder = _tree_folder(window, item);
 
-		dw_tree_set_data(window, item, 0);
-		dw_tree_delete(window, tempitem);
+		dw_tree_item_change_data(window, item, 0);
+		dw_tree_item_delete(window, tempitem);
 
 		if(*folder)
 		{
@@ -8406,7 +8406,7 @@
 		dw_box_pack_start(hbox, button, 50, 30, TRUE, FALSE, 3);
 		dw_signal_connect(button, DW_SIGNAL_CLICKED, DW_SIGNAL_FUNC(_dw_cancel_func), (void *)dwwait);
 
-		dw_window_set_usize(window, 225, 300);
+		dw_window_set_size(window, 225, 300);
 		dw_window_show(window);
 
 		dw_thread_new((void *)_populate_tree_thread, (void *)window, 0xff);
diff -r a9cfbc5ad01e -r 710f82598210 win/dw.c
--- a/win/dw.c	Mon Mar 08 03:46:17 2004 +0000
+++ b/win/dw.c	Tue Mar 09 03:27:39 2004 +0000
@@ -1726,7 +1726,7 @@
 							if(tmp->window == tem->hwndFrom && tem->code == tmp->message)
 							{
 								int (*switchpagefunc)(HWND, unsigned long, void *) = tmp->signalfunction;
-								unsigned long num=dw_notebook_page_query(tem->hwndFrom);
+								unsigned long num=dw_notebook_page_get(tem->hwndFrom);
 								result = switchpagefunc(tem->hwndFrom, num, tmp->data);
 								tmp = NULL;
 							}
@@ -3745,7 +3745,7 @@
  *       handle: Handle to widget for which to change.
  *       cursortype: ID of the pointer you want.
  */
-void API dw_window_pointer(HWND handle, int pointertype)
+void API dw_window_set_pointer(HWND handle, int pointertype)
 {
 /*
 	if(pointertype == DW_POINTER_ARROW)
@@ -5011,7 +5011,7 @@
  *          width: New width in pixels.
  *          height: New height in pixels.
  */
-void API dw_window_set_usize(HWND handle, ULONG width, ULONG height)
+void API dw_window_set_size(HWND handle, ULONG width, ULONG height)
 {
 	SetWindowPos(handle, (HWND)NULL, 0, 0, width, height, SWP_SHOWWINDOW | SWP_NOZORDER | SWP_NOMOVE);
 }
@@ -5279,7 +5279,7 @@
 		if(array[pageid]->hwnd)
 			dw_window_destroy(array[pageid]->hwnd);
 		array[pageid]->hwnd = tmpbox;
-		if(pageidx == dw_notebook_page_query(handle))
+		if(pageidx == dw_notebook_page_get(handle))
 		{
 			SetParent(tmpbox, handle);
 			_resize_notebook_page(handle, pageid);
@@ -5341,7 +5341,7 @@
  * Parameters:
  *          handle: Handle to the notebook widget.
  */
-unsigned long API dw_notebook_page_query(HWND handle)
+unsigned long API dw_notebook_page_get(HWND handle)
 {
 	NotebookPage **array = (NotebookPage **)dw_window_get_data(handle, "_dw_array");
 	int physid = TabCtrl_GetCurSel(handle);
@@ -5468,7 +5468,7 @@
  *          buffer: Buffer where text will be copied.
  *          length: Length of the buffer (including NULL).
  */
-void API dw_listbox_query_text(HWND handle, unsigned int index, char *buffer, unsigned int length)
+void API dw_listbox_get_text(HWND handle, unsigned int index, char *buffer, unsigned int length)
 {
 	char tmpbuf[100];
 	int len;
@@ -5718,7 +5718,7 @@
  *          bytes: A pointer to a variable to return the total bytes.
  *          lines: A pointer to a variable to return the number of lines.
  */
-void API dw_mle_query(HWND handle, unsigned long *bytes, unsigned long *lines)
+void API dw_mle_get_size(HWND handle, unsigned long *bytes, unsigned long *lines)
 {
 	if(bytes)
 		*bytes = GetWindowTextLength(handle);
@@ -5766,10 +5766,10 @@
  *          handle: Handle to the MLE.
  *          line: Line to be visible.
  */
-void API dw_mle_set_visible(HWND handle, int line)
+void API dw_mle_set_cursor_visible(HWND handle, int line)
 {
 	int point = (int)SendMessage(handle, EM_LINEINDEX, (WPARAM)line, 0);
-	dw_mle_set(handle, point);
+	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_editable(HWND handle, int state)
+void API dw_mle_set_cursor_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_word_wrap(HWND handle, int state)
+void API dw_mle_set_cursor_word_wrap(HWND handle, int state)
 {
 	/* If ES_AUTOHSCROLL is not set and there is not
 	 * horizontal scrollbar it word wraps.
@@ -5806,7 +5806,7 @@
  *          handle: Handle to the MLE to be positioned.
  *          point: Point to position cursor.
  */
-void API dw_mle_set(HWND handle, int point)
+void API dw_mle_set_cursor(HWND handle, int point)
 {
 	SendMessage(handle, EM_SETSEL, 0, MAKELONG(point,point));
 	SendMessage(handle, EM_SCROLLCARET, 0, 0);
@@ -5881,7 +5881,7 @@
  * Parameters:
  *          handle: Handle to the percent bar to be queried.
  */
-unsigned int API dw_percent_query_range(HWND handle)
+unsigned int API dw_percent_get_range(HWND handle)
 {
 	return (unsigned int)SendMessage(handle, PBM_GETRANGE, (WPARAM)FALSE, 0);
 }
@@ -5902,7 +5902,7 @@
  * Parameters:
  *          handle: Handle to the slider to be queried.
  */
-unsigned int API dw_slider_query_pos(HWND handle)
+unsigned int API dw_slider_get_pos(HWND handle)
 {
 	int max = (int)SendMessage(handle, TBM_GETRANGEMAX, 0, 0);
 	ULONG currentstyle = GetWindowLong(handle, GWL_STYLE);
@@ -5934,7 +5934,7 @@
  * Parameters:
  *          handle: Handle to the scrollbar to be queried.
  */
-unsigned int API dw_scrollbar_query_pos(HWND handle)
+unsigned int API dw_scrollbar_get_pos(HWND handle)
 {
 	return (unsigned int)SendMessage(handle, SBM_GETPOS, 0, 0);
 }
@@ -6024,7 +6024,7 @@
  * Parameters:
  *          handle: Handle to the spinbutton to be queried.
  */
-long API dw_spinbutton_query(HWND handle)
+long API dw_spinbutton_get_pos(HWND handle)
 {
 	if(IS_IE5PLUS)
 		return (long)SendMessage(handle, UDM_GETPOS32, 0, 0);
@@ -6037,7 +6037,7 @@
  * Parameters:
  *          handle: Handle to the checkbox to be queried.
  */
-int API dw_checkbox_query(HWND handle)
+int API dw_checkbox_get(HWND handle)
 {
 	if(SendMessage(handle, BM_GETCHECK, 0, 0) == BST_CHECKED)
 		return (in_checkbox_handler ? FALSE : TRUE);
@@ -6157,7 +6157,7 @@
  *          title: The text title of the entry.
  *          icon: Handle to coresponding icon.
  */
-void API dw_tree_set(HWND handle, HTREEITEM item, char *title, unsigned long icon)
+void API dw_tree_item_change(HWND handle, HTREEITEM item, char *title, unsigned long icon)
 {
 	TVITEM tvi;
 	void **ptrs;
@@ -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_set_data(HWND handle, HTREEITEM item, void *itemdata)
+void API dw_tree_item_change_data(HWND handle, HTREEITEM item, void *itemdata)
 {
 	TVITEM tvi;
 	void **ptrs;
@@ -6209,7 +6209,7 @@
  *          handle: Handle to the tree containing the item.
  *          item: Handle of the item to be modified.
  */
-void * API dw_tree_get_data(HWND handle, HTREEITEM item)
+void * API dw_tree_item_get_data(HWND handle, HTREEITEM item)
 {
 	TVITEM tvi;
 	void **ptrs;
@@ -6268,7 +6268,7 @@
 }
 
 /* Delete all tree subitems */
-void _dw_tree_delete_recursive(HWND handle, HTREEITEM node)
+void _dw_tree_item_delete_recursive(HWND handle, HTREEITEM node)
 {
 	HTREEITEM hti;
 
@@ -6279,7 +6279,7 @@
 		HTREEITEM lastitem = hti;
 
 		hti = TreeView_GetNextSibling(handle, hti);
-		dw_tree_delete(handle, lastitem);
+		dw_tree_item_delete(handle, lastitem);
 	}
 }
 
@@ -6297,9 +6297,9 @@
 	{
 		HTREEITEM lastitem = hti;
 
-		_dw_tree_delete_recursive(handle, hti);
+		_dw_tree_item_delete_recursive(handle, hti);
 		hti = TreeView_GetNextSibling(handle, hti);
-		dw_tree_delete(handle, lastitem);
+		dw_tree_item_delete(handle, lastitem);
 	}
 	dw_window_set_data(handle, "_dw_select_item", (void *)0);
 }
@@ -6310,7 +6310,7 @@
  *       handle: Handle to the tree window (widget).
  *       item: Handle to node to be expanded.
  */
-void API dw_tree_expand(HWND handle, HTREEITEM item)
+void API dw_tree_item_expand(HWND handle, HTREEITEM item)
 {
 	TreeView_Expand(handle, item, TVE_EXPAND);
 }
@@ -6321,7 +6321,7 @@
  *       handle: Handle to the tree window (widget).
  *       item: Handle to node to be collapsed.
  */
-void API dw_tree_collapse(HWND handle, HTREEITEM item)
+void API dw_tree_item_collapse(HWND handle, HTREEITEM item)
 {
 	TreeView_Expand(handle, item, TVE_COLLAPSE);
 }
@@ -6332,7 +6332,7 @@
  *       handle: Handle to the window (widget) to be cleared.
  *       item: Handle to node to be deleted.
  */
-void API dw_tree_delete(HWND handle, HTREEITEM item)
+void API dw_tree_item_delete(HWND handle, HTREEITEM item)
 {
 	TVITEM tvi;
 	void **ptrs;
@@ -6346,7 +6346,7 @@
 	if(TreeView_GetItem(handle, &tvi))
 		ptrs = (void **)tvi.lParam;
 
-	_dw_tree_delete_recursive(handle, item);
+	_dw_tree_item_delete_recursive(handle, item);
 	TreeView_DeleteItem(handle, item);
 	if(ptrs)
 		free(ptrs);