dwindows: os2/dw.c comparison

comparison os2/dw.c @ 90:eeb98f881663

Committed the dw_window_set/get_data() changes from the FX tree.

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Mon, 22 Apr 2002 08:34:35 +0000
parents	ab77a22a2a36
children	98cce029a611

comparison

equal deleted inserted replaced

-:ec311fe773da
+:eeb98f881663
 	dw_signal_disconnect_by_window(handle);
 #endif
 	if(ptr)
 	{
+		dw_window_set_data(handle, NULL, NULL);
 		WinSetWindowPtr(handle, QWP_USER, 0);
 		free(ptr);
 	}
 	henum = WinBeginEnumWindows(handle);
 *       text: The text to be display by the static text widget.
 *       id: An ID to be used with WinWindowFromID() or 0L.
 */
 HWND dw_status_text_new(char *text, ULONG id)
 {
-	PFNWP *blah = malloc(sizeof(PFNWP));
+	WindowData *blah = calloc(sizeof(WindowData), 1);
 	HWND tmp = WinCreateWindow(HWND_OBJECT,
 							   WC_STATIC,
 							   text,
 							   WS_VISIBLE | SS_TEXT,
 							   0,0,2000,1000,
 							   NULL,
 							   NULL);
 	dw_window_set_font(tmp, DefaultFont);
 	dw_window_set_color(tmp, DW_CLR_BLACK, DW_CLR_PALEGRAY);
-	*blah = WinSubclassWindow(tmp, _statusproc);
+	blah->oldproc = WinSubclassWindow(tmp, _statusproc);
 	WinSetWindowPtr(tmp, QWP_USER, blah);
 	return tmp;
 }
 /*
 *       text: The text to be display by the static text widget.
 *       id: An ID to be used with WinWindowFromID() or 0L.
 */
 HWND dw_button_new(char *text, ULONG id)
 {
-	BubbleButton *bubble = malloc(sizeof(BubbleButton));
+	BubbleButton *bubble = calloc(sizeof(BubbleButton), 1);
 	HWND tmp = WinCreateWindow(HWND_OBJECT,
 							   WC_BUTTON,
 							   text,
 							   WS_VISIBLE,
 */
 HWND dw_bitmapbutton_new(char *text, ULONG id)
 {
 	char idbuf[256];
 	HWND tmp;
-	BubbleButton *bubble = malloc(sizeof(BubbleButton));
+	BubbleButton *bubble = calloc(sizeof(BubbleButton), 1);
 	_GenResIDStr(idbuf, id);
 	tmp = WinCreateWindow(HWND_OBJECT,
 						  WC_BUTTON,
 *       text: The text to be display by the static text widget.
 *       id: An ID to be used with WinWindowFromID() or 0L.
 */
 HWND dw_spinbutton_new(char *text, ULONG id)
 {
-	PFNWP *blah = malloc(sizeof(PFNWP));
+	WindowData *blah = calloc(sizeof(WindowData), 1);
 	HWND tmp = WinCreateWindow(HWND_OBJECT,
 							   WC_SPINBUTTON,
 							   text,
 							   WS_VISIBLE | SPBS_MASTER,
 							   0,0,2000,1000,
 							   HWND_TOP,
 							   id,
 							   NULL,
 							   NULL);
 	dw_window_set_font(tmp, DefaultFont);
-	*blah = WinSubclassWindow(tmp, _entryproc);
+	blah->oldproc = WinSubclassWindow(tmp, _entryproc);
 	WinSetWindowPtr(tmp, QWP_USER, blah);
 	return tmp;
 }
 /*
 *       text: The text to be display by the static text widget.
 *       id: An ID to be used with WinWindowFromID() or 0L.
 */
 HWND dw_radiobutton_new(char *text, ULONG id)
 {
-	PFNWP *blah = malloc(sizeof(PFNWP));
+	WindowData *blah = calloc(sizeof(WindowData), 1);
 	HWND tmp = WinCreateWindow(HWND_OBJECT,
 							   WC_BUTTON,
 							   text,
 							   WS_VISIBLE |
 							   BS_AUTORADIOBUTTON,
 							   id,
 							   NULL,
 							   NULL);
 	dw_window_set_font(tmp, DefaultFont);
 	dw_window_set_color(tmp, DW_CLR_BLACK, DW_CLR_PALEGRAY);
-	*blah = WinSubclassWindow(tmp, _entryproc);
+	blah->oldproc = WinSubclassWindow(tmp, _entryproc);
 	WinSetWindowPtr(tmp, QWP_USER, blah);
 	return tmp;
 }
 /*
 *       text: The text to be display by the static text widget.
 *       id: An ID to be used with WinWindowFromID() or 0L.
 */
 HWND dw_checkbox_new(char *text, ULONG id)
 {
-	BubbleButton *bubble = malloc(sizeof(BubbleButton));
+	BubbleButton *bubble = calloc(sizeof(BubbleButton), 1);
 	HWND tmp = WinCreateWindow(HWND_OBJECT,
 							   WC_BUTTON,
 							   text,
 							   WS_VISIBLE | BS_AUTOCHECKBOX,
 							   0,0,2000,1000,
 *       id: An ID to be used with WinWindowFromID() or 0L.
 *       multi: Multiple select TRUE or FALSE.
 */
 HWND dw_listbox_new(ULONG id, int multi)
 {
-	PFNWP *blah = malloc(sizeof(PFNWP));
+	WindowData *blah = calloc(sizeof(WindowData), 1);
 	HWND tmp = WinCreateWindow(HWND_OBJECT,
 							   WC_LISTBOX,
 							   NULL,
 							   WS_VISIBLE | LS_NOADJUSTPOS |
 							   (multi ? LS_MULTIPLESEL : 0),
 							   HWND_TOP,
 							   id,
 							   NULL,
 							   NULL);
 	dw_window_set_font(tmp, DefaultFont);
-	*blah = WinSubclassWindow(tmp, _entryproc);
+	blah->oldproc = WinSubclassWindow(tmp, _entryproc);
 	WinSetWindowPtr(tmp, QWP_USER, blah);
 	return tmp;
 }
 /*
 void dw_window_function(HWND handle, void *function, void *data)
 {
 	WinSendMsg(handle, WM_USER, (MPARAM)function, (MPARAM)data);
 }
+/* Functions for managing the user data lists that are associated with
+* a given window handle.  Used in dw_window_set_data() and
+* dw_window_get_data().
+*/
+UserData *find_userdata(UserData **root, char *varname)
+{
+	UserData *tmp = *root;
+	while(tmp)
+	{
+		if(stricmp(tmp->varname, varname) == 0)
+			return tmp;
+		tmp = tmp->next;
+	}
+	return NULL;
+}
+int new_userdata(UserData **root, char *varname, void *data)
+{
+	UserData *new = find_userdata(root, varname);
+	if(new)
+	{
+		new->data = data;
+		return TRUE;
+	}
+	else
+	{
+		new = malloc(sizeof(UserData));
+		if(new)
+		{
+			new->varname = strdup(varname);
+			new->data = data;
+			new->next = NULL;
+			if (!*root)
+				*root = new;
+			else
+			{
+				UserData *prev = NULL, *tmp = *root;
+				while(tmp)
+				{
+					prev = tmp;
+					tmp = tmp->next;
+				}
+				if(prev)
+					prev->next = new;
+				else
+					*root = new;
+			}
+			return TRUE;
+		}
+	}
+	return FALSE;
+}
+int remove_userdata(UserData **root, char *varname, int all)
+{
+	UserData *prev = NULL, *tmp = *root;
+	while(tmp)
+	{
+		if(all || stricmp(tmp->varname, varname) == 0)
+		{
+			if(!prev)
+			{
+				free(tmp->varname);
+				free(tmp);
+				*root = NULL;
+				return 0;
+			}
+			else
+			{
+				prev->next = tmp->next;
+				free(tmp->varname);
+				free(tmp);
+				return 0;
+			}
+		}
+		tmp = tmp->next;
+	}
+	return 0;
+}
+/*
+* Add a named user data item to a window handle.
+* Parameters:
+*       window: Window handle of signal to be called back.
+*       dataname: A string pointer identifying which signal to be hooked.
+*       data: User data to be passed to the handler function.
+*/
+void dw_window_set_data(HWND window, char *dataname, void *data)
+{
+	WindowData *blah = (WindowData *)WinQueryWindowPtr(window, QWP_USER);
+	if(blah)
+	{
+		if(data)
+			new_userdata(&(blah->root), dataname, data);
+		else
+		{
+			if(dataname)
+				remove_userdata(&(blah->root), dataname, FALSE);
+			else
+				remove_userdata(&(blah->root), NULL, TRUE);
+		}
+	}
+}
+/*
+* Gets a named user data item to a window handle.
+* Parameters:
+*       window: Window handle of signal to be called back.
+*       dataname: A string pointer identifying which signal to be hooked.
+*       data: User data to be passed to the handler function.
+*/
+void *dw_window_get_data(HWND window, char *dataname)
+{
+	WindowData *blah = (WindowData *)WinQueryWindowPtr(window, QWP_USER);
+	if(blah && blah->root && dataname)
+	{
+		UserData *ud = find_userdata(&(blah->root), dataname);
+		if(ud)
+			return ud->data;
+	}
+	return NULL;
+}
 #ifndef NO_SIGNALS
 /*
 * Add a callback to a window event.
 * Parameters:
 *       window: Window handle of signal to be called back.

Mercurial > dwindows

comparison os2/dw.c @ 90:eeb98f881663