Mercurial > dwindows

changeset 68:8d6100960adf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Minor tab changes on OS/2 and Windows.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Tue, 22 Jan 2002 23:45:01 +0000
parents ab9b0fa6c66e
children 9510897c0b03
files os2/dw.c win/dw.c
diffstat 2 files changed, 68 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/os2/dw.c	Tue Jan 22 10:55:20 2002 +0000
+++ b/os2/dw.c	Tue Jan 22 23:45:01 2002 +0000
@@ -137,6 +137,14 @@
 		SignalHandler *prev = NULL, *tmp = Root;
 		while(tmp)
 		{
+			if(tmp->message == message &&
+			   tmp->window == window &&
+			   tmp->signalfunction == signalfunction)
+			{
+				tmp->data = data;
+				free(new);
+				return;
+			}
 			prev = tmp;
 			tmp = tmp->next;
 		}
--- a/win/dw.c	Tue Jan 22 10:55:20 2002 +0000
+++ b/win/dw.c	Tue Jan 22 23:45:01 2002 +0000
@@ -265,6 +265,14 @@
 		SignalHandler *prev = NULL, *tmp = Root;
 		while(tmp)
 		{
+			if(tmp->message == message &&
+			   tmp->window == window &&
+			   tmp->signalfunction == signalfunction)
+			{
+				tmp->data = data;
+				free(new);
+				return;
+			}
 			prev = tmp;
 			tmp = tmp->next;
 		}
@@ -332,7 +340,8 @@
 	   strnicmp(tmpbuf, LISTBOXCLASSNAME, strlen(LISTBOXCLASSNAME)+1)==0 ||    /* List box */
 	   strnicmp(tmpbuf, UPDOWN_CLASS, strlen(UPDOWN_CLASS)+1)==0 ||            /* Spinbutton */
 	   strnicmp(tmpbuf, TRACKBAR_CLASS, strlen(TRACKBAR_CLASS)+1)==0 ||        /* Slider */
-	   strnicmp(tmpbuf, WC_LISTVIEW, strlen(WC_LISTVIEW)+1)== 0)               /* Container */
+	   strnicmp(tmpbuf, WC_LISTVIEW, strlen(WC_LISTVIEW)+1)== 0 ||             /* Container */
+	   strnicmp(tmpbuf, WC_TREEVIEW, strlen(WC_TREEVIEW)+1)== 0)               /* Tree */
 		return 1;
 	return 0;
 }
@@ -2073,6 +2082,31 @@
 	return CallWindowProc(cinfo->pOldProc, hWnd, msg, mp1, mp2);
 }
 
+BOOL CALLBACK _treewndproc(HWND hWnd, UINT msg, WPARAM mp1, LPARAM mp2)
+{
+	ContainerInfo *cinfo;
+
+	cinfo = (ContainerInfo *)GetWindowLong(hWnd, GWL_USERDATA);
+
+	switch( msg )
+	{
+	case WM_CHAR:
+		if(LOWORD(mp1) == '\t')
+		{
+			if(GetAsyncKeyState(VK_SHIFT))
+				_shift_focus_back(hWnd);
+			else
+				_shift_focus(hWnd);
+			return FALSE;
+		}
+		break;
+	}
+
+	if(!cinfo || !cinfo->pOldProc)
+		return DefWindowProc(hWnd, msg, mp1, mp2);
+	return CallWindowProc(cinfo->pOldProc, hWnd, msg, mp1, mp2);
+}
+
 void _changebox(Box *thisbox, int percent, int type)
 {
 	int z;
@@ -3542,6 +3576,7 @@
 	}
 
 	cinfo->pOldProc = (WNDPROC)SubclassWindow(tmp, _containerwndproc);
+	cinfo->cinfo.fore = cinfo->cinfo.back = -1;
 
 	SetWindowLong(tmp, GWL_USERDATA, (ULONG)cinfo);
 	dw_window_set_font(tmp, DefaultFont);
@@ -3566,7 +3601,19 @@
 							(HMENU)id,
 							NULL,
 							NULL);
+	ContainerInfo *cinfo = (ContainerInfo *)calloc(1, sizeof(ContainerInfo));
 	TreeView_SetItemHeight(tmp, 16);
+
+	if(!cinfo)
+	{
+		DestroyWindow(tmp);
+		return NULL;
+	}
+
+	cinfo->pOldProc = (WNDPROC)SubclassWindow(tmp, _treewndproc);
+	cinfo->cinfo.fore = cinfo->cinfo.back = -1;
+
+	SetWindowLong(tmp, GWL_USERDATA, (ULONG)cinfo);
 	dw_window_set_font(tmp, DefaultFont);
 	return tmp;
 }
@@ -3661,6 +3708,18 @@
 							  (HMENU)id,
 							  NULL,
 							  NULL);
+	ContainerInfo *cinfo = (ContainerInfo *)calloc(1, sizeof(ContainerInfo));
+
+	if(!cinfo)
+	{
+		DestroyWindow(tmp);
+		return NULL;
+	}
+
+	cinfo->pOldProc = (WNDPROC)SubclassWindow(tmp, _treewndproc);
+	cinfo->cinfo.fore = cinfo->cinfo.back = -1;
+
+	SetWindowLong(tmp, GWL_USERDATA, (ULONG)cinfo);
 	dw_window_set_font(tmp, DefaultFont);
 	return tmp;
 }