dwindows: os2/dw.c comparison

comparison os2/dw.c @ 40:88c9c7410c22

Lots of fixes and new functions on all platforms.

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Mon, 22 Oct 2001 22:32:58 +0000
parents	3aa9ef0b3996
children	997e9ed670ef

comparison

equal deleted inserted replaced

-:3aa9ef0b3996
+:88c9c7410c22
 	}
 	return WinDefWindowProc(hWnd, msg, mp1, mp2);
 }
+void _click_default(HWND handle)
+{
+	char tmpbuf[100];
+	WinQueryClassName(handle, 99, tmpbuf);
+	/* These are the window classes which can
+	 * obtain input focus.
+	 */
+	if(strncmp(tmpbuf, "#3", 3)==0)
+	{
+		/* Generate click on default item */
+		SignalHandler *tmp = Root;
+		/* Find any callbacks for this function */
+		while(tmp)
+		{
+			if(tmp->message == WM_COMMAND)
+			{
+				int (*clickfunc)(HWND, void *) = (int (*)(HWND, void *))tmp->signalfunction;
+				/* Make sure it's the right window, and the right ID */
+				if(tmp->window == handle)
+				{
+					clickfunc(tmp->window, tmp->data);
+					tmp = NULL;
+				}
+			}
+			if(tmp)
+				tmp= tmp->next;
+		}
+	}
+	else
+		WinSetFocus(HWND_DESKTOP, handle);
+}
 /* Originally just intended for entryfields, it now serves as a generic
 * procedure for handling TAB presses to change input focus on controls.
 */
 MRESULT EXPENTRY _entryproc(HWND hWnd, ULONG msg, MPARAM mp1, MPARAM mp2)
 {
-	PFNWP *blah = WinQueryWindowPtr(hWnd, QWP_USER);
+	WindowData *blah = (WindowData *)WinQueryWindowPtr(hWnd, QWP_USER);
 	switch(msg)
 	{
 	case WM_BUTTON1DOWN:
 	case WM_BUTTON2DOWN:
 		if(SHORT1FROMMP(mp2) == '\t')
 		{
 			_shift_focus(hWnd);
 			return FALSE;
 		}
+		else if(SHORT1FROMMP(mp2) == '\r' && blah && blah->clickdefault)
+			_click_default(blah->clickdefault);
 		break;
 	}
-	if(blah && *blah)
+	if(blah && blah->oldproc)
-	{
+		return blah->oldproc(hWnd, msg, mp1, mp2);
-		PFNWP myfunc = *blah;
-		return myfunc(hWnd, msg, mp1, mp2);
-	}
 	return WinDefWindowProc(hWnd, msg, mp1, mp2);
 }
 /* Handle correct painting of a combobox with the WS_CLIPCHILDREN
 * flag enabled, and also handle TABs to switch input focus.
 */
 MRESULT EXPENTRY _comboproc(HWND hWnd, ULONG msg, MPARAM mp1, MPARAM mp2)
 {
-	PFNWP *blah = WinQueryWindowPtr(hWnd, QWP_USER);
+	WindowData *blah = WinQueryWindowPtr(hWnd, QWP_USER);
 	switch(msg)
 	{
 	case WM_CHAR:
 		if(SHORT1FROMMP(mp2) == '\t')
 		{
 			_shift_focus(hWnd);
 			return FALSE;
 		}
+		else if(SHORT1FROMMP(mp2) == '\r' && blah && blah->clickdefault)
+			_click_default(blah->clickdefault);
 		break;
 	case WM_BUTTON1DOWN:
 	case WM_BUTTON2DOWN:
 	case WM_BUTTON3DOWN:
 		_run_event(hWnd, WM_SETFOCUS, (MPARAM)FALSE, (MPARAM)TRUE);
 			WinReleasePS(hpsPaint);
 		}
 		break;
 	}
-	if(blah && *blah)
+	if(blah && blah->oldproc)
-	{
+		return blah->oldproc(hWnd, msg, mp1, mp2);
-		PFNWP myfunc = *blah;
-		return myfunc(hWnd, msg, mp1, mp2);
-	}
 	return WinDefWindowProc(hWnd, msg, mp1, mp2);
 }
 void _GetPPFont(HWND hwnd, char *buff)
 		return TRUE;
 	return FALSE;
 }
 /*
+* Makes the window topmost.
+* Parameters:
+*           handle: The window handle to make topmost.
+*/
+int dw_window_raise(HWND handle)
+{
+	return WinSetWindowPos(handle, HWND_TOP, 0, 0, 0, 0, SWP_ZORDER);
+}
+/*
+* Makes the window bottommost.
+* Parameters:
+*           handle: The window handle to make bottommost.
+*/
+int dw_window_lower(HWND handle)
+{
+	return WinSetWindowPos(handle, HWND_BOTTOM, 0, 0, 0, 0, SWP_ZORDER);
+}
+/*
 * Makes the window visible.
 * Parameters:
 *           handle: The window handle to make visible.
 */
 int dw_window_show(HWND handle)
 *       text: The default text to be in the entryfield widget.
 *       id: An ID to be used with WinWindowFromID() or 0L.
 */
 HWND dw_entryfield_new(char *text, ULONG id)
 {
-	PFNWP *blah = malloc(sizeof(PFNWP));
+	WindowData *blah = calloc(1, sizeof(WindowData));
 	HWND tmp = WinCreateWindow(HWND_OBJECT,
 							   WC_ENTRYFIELD,
 							   text,
 							   WS_VISIBLE | ES_MARGIN |
 							   ES_AUTOSCROLL | WS_TABSTOP,
 							   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 default text to be in the entryfield widget.
 *       id: An ID to be used with WinWindowFromID() or 0L.
 */
 HWND dw_entryfield_password_new(char *text, ULONG id)
 {
-	PFNWP *blah = malloc(sizeof(PFNWP));
+	WindowData *blah = calloc(1, sizeof(WindowData));
 	HWND tmp = WinCreateWindow(HWND_OBJECT,
 							   WC_ENTRYFIELD,
 							   text,
 							   WS_VISIBLE | ES_MARGIN | ES_UNREADABLE |
 							   ES_AUTOSCROLL | WS_TABSTOP,
 							   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 default text to be in the combpbox widget.
 *       id: An ID to be used with WinWindowFromID() or 0L.
 */
 HWND dw_combobox_new(char *text, ULONG id)
 {
-	PFNWP *blah = malloc(sizeof(PFNWP));
+	WindowData *blah = calloc(1, sizeof(WindowData));
 	HWND tmp = WinCreateWindow(HWND_OBJECT,
 							   WC_COMBOBOX,
 							   text,
 							   WS_VISIBLE | CBS_DROPDOWN | WS_GROUP,
 							   0,0,2000,1000,
 							   id,
 							   NULL,
 							   NULL);
 	dw_window_set_font(tmp, DefaultFont);
 	dw_window_set_color(tmp, DW_CLR_BLACK, DW_CLR_WHITE);
-	*blah = WinSubclassWindow(tmp, _comboproc);
+	blah->oldproc = WinSubclassWindow(tmp, _comboproc);
 	WinSetWindowPtr(tmp, QWP_USER, blah);
 	return tmp;
 }
 /*
 	if(box)
 		thisbox = WinQueryWindowPtr(box, QWP_USER);
 	if(thisbox)
 		thisbox->defaultitem = defaultitem;
+}
+/*
+* Sets window to click the default dialog item when an ENTER is pressed.
+* Parameters:
+*         window: Window (widget) to look for the ENTER press.
+*         next: Window (widget) to move to next (or click)
+*/
+void dw_window_click_default(HWND window, HWND next)
+{
+	WindowData *blah = (WindowData *)WinQueryWindowPtr(window, QWP_USER);
+	char tmpbuf[100];
+	WinQueryClassName(window, 99, tmpbuf);
+	/* These are the window classes which can
+	 * obtain input focus.
+	 */
+	if(strncmp(tmpbuf, "#6", 3) == 0 && blah)
+		blah->clickdefault = next;
 }
 /*
 * Returns some information about the current operating environment.
 * Parameters:

Mercurial > dwindows

comparison os2/dw.c @ 40:88c9c7410c22