dwindows: os2/dw.c comparison

comparison os2/dw.c @ 510:710f82598210

Change function names to be inline with Mark Hessling's Rexx/DW.

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Tue, 09 Mar 2004 03:27:39 +0000
parents	078a40ba2e41
children	80dbd5a1f403

comparison

equal deleted inserted replaced

-:a9cfbc5ad01e
+:710f82598210
 				}
 				else if(strncmp(tmpbuf, "#40", 4)==0) /* Notebook */
 				{
 					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)
 					{
 						notebox = (Box *)WinQueryWindowPtr(page, QWP_USER);
 				}
 				else if(strncmp(tmpbuf, "#40", 4)==0) /* Notebook */
 				{
 					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)
 					{
 						notebox = (Box *)WinQueryWindowPtr(page, QWP_USER);
 }
 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;
 	return (int)fnew;
 }
 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;
 		float frange = (float)range;
 		float fnew = (fpos/frange)*1000.0;
 	int min, max, page;
 	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);
 	max = SHORT2FROMMP(res);
 	page = (int)dw_window_get_data(handle, "_dw_scrollbar_visible");
 								if(_recursing == 0 && (tmp->window == conthwnd || (!id && tmp->window == (HWND)mp2)))
 								{
 									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;
 									if(id && strncmp(classbuf, "#2", 3)==0)
 									{
 * Changes the appearance of the mouse pointer.
 * Parameters:
 *       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));
 	else
 		dw_window_set_data(handle, "_dw_pointer",
 * Parameters:
 *          handle: Window (widget) handle.
 *          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);
 }
 /*
 /*
 * Queries the currently visible page ID.
 * 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));
 }
 /*
 *          handle: Handle to the listbox to be queried.
 *          index: Index into the list to be queried.
 *          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);
 }
 /*
 * Parameters:
 *          handle: Handle to the MLE to be queried.
 *          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);
 	if(lines)
 		*lines = (unsigned long)WinSendMsg(handle, MLM_QUERYLINECOUNT, 0, 0);
 */
 void API dw_mle_clear(HWND handle)
 {
 	unsigned long bytes;
-	dw_mle_query(handle, &bytes, NULL);
+	dw_mle_get_size(handle, &bytes, NULL);
 	WinSendMsg(handle, MLM_DELETE, MPFROMLONG(0), MPFROMLONG(bytes));
 }
 /*
 * Sets the visible line of an MLE box.
 * Parameters:
 *          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));
 }
 * Sets the editablity of an MLE box.
 * Parameters:
 *          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);
 }
 /*
 * Sets the word wrap state of an MLE box.
 * Parameters:
 *          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);
 }
 /*
 * Sets the current cursor position of an MLE box.
 * Parameters:
 *          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));
 }
 /*
 /*
 * Returns the range of the percent bar.
 * 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));
 }
 /*
 /*
 * Returns the position of the slider.
 * 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);
 }
 /*
 /*
 * Returns the position of the scrollbar.
 * 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);
 }
 /*
 /*
 * Returns the current value of the spinbutton.
 * 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;
 	WinSendMsg(handle, SPBM_QUERYVALUE, (MPARAM)&tmpval,0L);
 return tmpval;
 /*
 * Returns the state of the checkbox.
 * 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);
 }
 /*
 *          handle: Handle to the tree containing the item.
 *          item: Handle of the item to be modified.
 *          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;
 	if(!pci)
 		return;
 * Parameters:
 *          handle: Handle to the tree containing the item.
 *          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;
 	handle = handle; /* keep compiler happy */
 	if(!pci)
 * Gets the item data of a tree item.
 * Parameters:
 *          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;
 	handle = handle; /* keep compiler happy */
 	if(!pci)
 * Expands a node on a tree.
 * Parameters:
 *       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);
 }
 /*
 * Collapses a node on a tree.
 * Parameters:
 *       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);
 }
 /*
 * Removes a node from a tree.
 * Parameters:
 *       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;
 	if(!item)
 		return;
 				strcpy(folder, path);
 				strcpy(&folder[len-1], ffbuf.achName);
 				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);
 	}
 }
 			folder[0] = name[6] = 'A' + drive;
 			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;
 	}
 	dw_mutex_unlock(mtx);
 	return FALSE;
 }
 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_item_change_data(window, item, 0);
-		dw_tree_delete(window, tempitem);
+		dw_tree_item_delete(window, tempitem);
 		if(*folder)
 		{
 			strcat(folder, "*");
 			_populate_directory(window, item, folder);
 		button = dw_button_new("Cancel", 1002L);
 		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);
 		return (char *)dw_dialog_wait(dwwait);
 	}

Mercurial > dwindows

comparison os2/dw.c @ 510:710f82598210