dwindows: win/dw.c comparison

comparison win/dw.c @ 571:828e6a66c5c5

Add dw_listbox_list_append()

author	mhessling@81767d24-ef19-dc11-ae90-00e081727c95
date	Tue, 20 Jul 2004 07:36:11 +0000
parents	f6de197ecbe9
children	314abd650968

comparison

equal deleted inserted replaced

-:052e9e4a59bd
+:828e6a66c5c5
-/*
 /*
 * Dynamic Windows:
 *          A GTK like implementation of the Win32 GUI
 *
 * (C) 2000-2004 Brian Smith <dbsoft@technologist.com>
 #include <string.h>
 #include <stdio.h>
 #include <process.h>
 #include <time.h>
 #include "dw.h"
+/*
+* MinGW (as at 3.2.3) doesn't have MIM_MENUDATA
+* so #define it here
+*/
+#if !defined( MIM_MENUDATA )
+# define MIM_MENUDATA 0x00000008
+#endif
 HWND popup = (HWND)NULL, hwndBubble = (HWND)NULL, DW_HWND_OBJECT = (HWND)NULL;
 HINSTANCE DWInstance = NULL;
 	{
 		NotebookPage **array = (NotebookPage **)dw_window_get_data(handle, "_dw_array");
 		if(array)
 		{
-			int z, refid = -1;
+			int z;
 			for(z=0;z<256;z++)
 			{
 				if(array[z])
 				{
 					{
 						int (*buttonfunc)(HWND, int, int, int, void *) = (int (*)(HWND, int, int, int, void *))tmp->signalfunction;
 						if(hWnd == tmp->window)
 						{
-							int button;
+							int button=0;
 							switch(origmsg)
 							{
 							case WM_LBUTTONDOWN:
 								button = 1;
 					{
 						int (*buttonfunc)(HWND, int, int, int, void *) = (int (*)(HWND, int, int, int, void *))tmp->signalfunction;
 						if(hWnd == tmp->window)
 						{
-							int button;
+							int button=0;
 							switch(origmsg)
 							{
 							case WM_LBUTTONUP:
 								button = 1;
 					if(IS_IE5PLUS)
 						val = (long)SendMessage(cinfo->buddy, UDM_GETPOS32, 0, 0);
 					else
 						val = (long)SendMessage(cinfo->buddy, UDM_GETPOS, 0, 0);
-					sprintf(tmpbuf, "%d", val);
+					sprintf(tmpbuf, "%ld", val);
 					SetWindowText(hWnd, tmpbuf);
 				}
 			}
 			break;
 		case WM_CTLCOLORSTATIC:
 			BeginPaint(hwnd, &ps);
 			if((hdcPaint = GetDC(hwnd)) != NULL)
 			{
-				int cx, cy;
+				unsigned long cx, cy;
 				HBRUSH oldBrush = SelectObject(hdcPaint, GetSysColorBrush(COLOR_3DFACE));
 				HPEN oldPen = SelectObject(hdcPaint, CreatePen(PS_SOLID, 1, GetSysColor(COLOR_3DFACE)));
 				dw_window_get_pos_size(hwnd, NULL, NULL, &cx, &cy);
 		{
 			HDC hdcPaint;
 			PAINTSTRUCT ps;
 			RECT rc;
 			unsigned long cx, cy;
-			int threadid = dw_thread_id();
 			char tempbuf[1024] = "";
 			ColorInfo *cinfo = (ColorInfo *)GetWindowLongPtr(hwnd, GWLP_USERDATA);
 			HFONT hfont = _acquire_font(hwnd, cinfo ? cinfo->fontname : NULL);
 			HFONT oldfont = (HFONT)SendMessage(hwnd, WM_GETFONT, 0, 0);
 				}
 				if(!hwndBubble)
 				{
 					POINTL ptlWork = {0,0};
-					ULONG ulColor = DW_CLR_YELLOW;
 					SIZE size;
 					HFONT hFont, oldFont = (HFONT)0;
 					HDC hdc;
 					RECT rect;
-					void *oldproc;
 					/* Use the WS_EX_TOOLWINDOW extended style
 					 * so the window doesn't get listed in the
 					 * taskbar.
 					 */
 	InsertMenuItem(mymenu, 65535, TRUE, &mii);
 	if(!IS_WINNTOR95)
 	{
-		sprintf(buffer, "_dw_id%d", id);
+		sprintf(buffer, "_dw_id%ld", id);
 		dw_window_set_data(DW_HWND_OBJECT, buffer, (void *)mymenu);
 		/* According to the docs this will only work on Win2k/98 and above */
 		if(submenu)
 		{
 *       text: The text to be display by the static text widget.
 *       id: An ID to be used with dw_window_from_id() or 0L.
 */
 HWND API dw_spinbutton_new(char *text, ULONG id)
 {
-	ULONG *data = malloc(sizeof(ULONG));
 	HWND buddy = CreateWindowEx(WS_EX_CLIENTEDGE,
 								EDITCLASSNAME,
 								text,
 								WS_CHILD | WS_BORDER | WS_VISIBLE |
 								ES_NUMBER | WS_CLIPCHILDREN,
 					LB_ADDSTRING,
 					0, (LPARAM)text);
 }
 /*
+* Appends the specified text items to the listbox's (or combobox) entry list.
+* Parameters:
+*          handle: Handle to the listbox to be appended to.
+*          text: Text strings to append into listbox.
+*          count: Number of text strings to append
+*/
+void API dw_listbox_list_append(HWND handle, char **text, int count)
+{
+	char tmpbuf[100];
+	int listbox_type;
+	int i;
+	GetClassName(handle, tmpbuf, 99);
+	if(strnicmp(tmpbuf, COMBOBOXCLASSNAME, strlen(COMBOBOXCLASSNAME)+1)==0)
+		listbox_type = CB_ADDSTRING;
+	else
+		listbox_type = LB_ADDSTRING;
+	for(i=0;i<count;i++)
+		SendMessage(handle,(WPARAM)listbox_type,0,(LPARAM)text[i]);
+}
+/*
 * Clears the listbox's (or combobox) list of all entries.
 * Parameters:
 *          handle: Handle to the listbox to be cleared.
 */
 void API dw_listbox_clear(HWND handle)
 void API dw_spinbutton_set_pos(HWND handle, long position)
 {
 	char tmpbuf[100];
 	ColorInfo *cinfo = (ColorInfo *)GetWindowLongPtr(handle, GWLP_USERDATA);
-	sprintf(tmpbuf, "%d", position);
+	sprintf(tmpbuf, "%ld", position);
 	if(cinfo && cinfo->buddy)
 		SetWindowText(cinfo->buddy, tmpbuf);
 	if(IS_IE5PLUS)
 *       item: Handle to node to be deleted.
 */
 void API dw_tree_item_delete(HWND handle, HTREEITEM item)
 {
 	TVITEM tvi;
-	void **ptrs;
+	void **ptrs=NULL;
 	if(item == TVI_ROOT || !item)
 		return;
 	tvi.mask = TVIF_HANDLE;
 		ListView_GetItem(handle, &lvi);
 		if((char *)lvi.lParam == text)
 		{
-			RECT viewport, item;
 			ListView_SetItemState(handle, index, LVIS_FOCUSED | LVIS_SELECTED, LVIS_FOCUSED | LVIS_SELECTED);
 			ListView_EnsureVisible(handle, index, TRUE);
 			return;
 		}
 *       handle: Handle to the window (widget) to be optimized.
 */
 void API dw_container_optimize(HWND handle)
 {
 	ContainerInfo *cinfo = (ContainerInfo *)GetWindowLongPtr(handle, GWLP_USERDATA);
-	ULONG *flags;
-	LV_ITEM lvi;
 	if(cinfo && cinfo->columns == 1)
 	{
 		ListView_SetColumnWidth(handle, 0, LVSCW_AUTOSIZE);
 	}
 *       height: Height of rectangle.
 */
 void API dw_draw_rect(HWND handle, HPIXMAP pixmap, int fill, int x, int y, int width, int height)
 {
 	HDC hdcPaint;
-	HPEN oldPen;
-	HBRUSH oldBrush;
 	RECT Rect;
 	int threadid = dw_thread_id();
 	if(threadid < 0 || threadid >= THREAD_LIMIT)
 		threadid = 0;
 *       text: Text to be displayed.
 */
 void API dw_draw_text(HWND handle, HPIXMAP pixmap, int x, int y, char *text)
 {
 	HDC hdc;
-	int size = 9, z, mustdelete = 0;
+	int mustdelete = 0;
 	HFONT hFont = 0, oldFont = 0;
 	int threadid = dw_thread_id();
 	ColorInfo *cinfo;
 	if(threadid < 0 || threadid >= THREAD_LIMIT)
 *       A handle to a pixmap or NULL on failure.
 */
 HPIXMAP API dw_pixmap_new(HWND handle, unsigned long width, unsigned long height, int depth)
 {
 	HPIXMAP pixmap;
-	BITMAP bm;
 	HDC hdc;
 	if (!(pixmap = calloc(1,sizeof(struct _hpixmap))))
 		return NULL;

Mercurial > dwindows

comparison win/dw.c @ 571:828e6a66c5c5