dwindows: os2/dw.c comparison

comparison os2/dw.c @ 405:4c084ec3e176

Ok, so that last fix has some problems, this new fix is a hybrid of the old fix and the new fix, I think it finally works as advertised. ;)

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Sun, 11 May 2003 00:33:33 +0000
parents	720e61df8cf6
children	765ec42ee2e4

comparison

equal deleted inserted replaced

-:720e61df8cf6
+:4c084ec3e176
 				WinQueryClassName(handle, 99, tmpbuf);
 				if(strncmp(tmpbuf, "#2", 3)==0)
 				{
+					HWND frame = (HWND)dw_window_get_data(handle, "_dw_combo_box");
 					/* Make the combobox big enough to drop down. :) */
-if(dw_window_get_data(handle, "_dw_dropped"))
+					WinSetWindowPos(handle, HWND_TOP, 0, -100,
-						WinSetWindowPos(handle, HWND_TOP, currentx + pad, (currenty + pad) - 100,
+									width + vectorx, (height + vectory) + 100, SWP_MOVE | SWP_SIZE | SWP_ZORDER);
-										width + vectorx, (height + vectory) + 100, SWP_MOVE | SWP_SIZE | SWP_ZORDER);
+					WinSetWindowPos(frame, HWND_TOP, currentx + pad, currenty + pad,
-					else
+									width + vectorx, height + vectory, SWP_MOVE | SWP_SIZE | SWP_ZORDER);
-						WinSetWindowPos(handle, HWND_TOP, currentx + pad, currenty + pad,
-										width + vectorx, height + vectory, SWP_MOVE | SWP_SIZE | SWP_ZORDER);
 				}
 				else if(strncmp(tmpbuf, "#6", 3)==0)
 				{
 					/* Entryfields on OS/2 have a thick border that isn't on Windows and GTK */
 					WinSetWindowPos(handle, HWND_TOP, (currentx + pad) + 3, (currenty + pad) + 3,
 			return (MRESULT)TRUE;
 		_run_event(hWnd, WM_SETFOCUS, (MPARAM)FALSE, (MPARAM)TRUE);
 		break;
 	case WM_SETFOCUS:
 		_run_event(hWnd, msg, mp1, mp2);
-		break;
-	case CBM_SHOWLIST:
-		{
-			int dropped = dw_window_get_data(hWnd, "_dw_dropped");
-			if(mp1)
-			{
-				if(!dropped)
-				{
-					SWP swp;
-					WinQueryWindowPos(hWnd, &swp);
-					WinSetWindowPos(hWnd, NULLHANDLE, swp.x, swp.y - 100, swp.cx, swp.cy + 100, SWP_MOVE | SWP_SIZE);
-					dw_window_set_data(hWnd, "_dw_dropped", (void *)1);
-				}
-			}
-			else
-			{
-				if(dropped)
-				{
-					SWP swp;
-					WinQueryWindowPos(hWnd, &swp);
-					WinSetWindowPos(hWnd, NULLHANDLE, swp.x, swp.y + 100, swp.cx, swp.cy - 100, SWP_MOVE | SWP_SIZE);
-					dw_window_set_data(hWnd, "_dw_dropped", (void *)0);
-				}
-			}
-		}
 		break;
 	case WM_PAINT:
 		{
 			HWND entry, parent = WinQueryWindow(hWnd, QW_PARENT);
 			HPS hpsPaint;
 * Parameters:
 *           handle: The window handle to destroy.
 */
 int API dw_window_destroy(HWND handle)
 {
-	HWND parent = WinQueryWindow(handle, QW_PARENT);
+	HWND frame, parent = WinQueryWindow(handle, QW_PARENT);
 	Box *thisbox = WinQueryWindowPtr(parent, QWP_USER);
 	if(!handle)
 		return -1;
+	frame = (HWND)dw_window_get_data(handle, "_dw_combo_box");
 	if(parent != desktop && thisbox && thisbox->count)
 	{
 		int z, index = -1;
 		Item *tmpitem, *thisitem = thisbox->items;
 		thisbox->items = tmpitem;
 		free(thisitem);
 		thisbox->count--;
 		_free_window_memory(handle);
 	}
-	return WinDestroyWindow(handle);
+	return WinDestroyWindow(frame ? frame : handle);
 }
 /* Causes entire window to be invalidated and redrawn.
 * Parameters:
 *           handle: Toplevel window handle to be redrawn.
 *       id: An ID to be used with dw_window_from_id() or 0L.
 */
 HWND API dw_combobox_new(char *text, ULONG id)
 {
 	WindowData *blah = calloc(1, sizeof(WindowData));
-	HWND tmp = WinCreateWindow(HWND_OBJECT,
+	HWND frame = WinCreateWindow(HWND_OBJECT,
+								 WC_FRAME,
+								 NULL,
+								 WS_VISIBLE | WS_CLIPCHILDREN |
+								 FS_NOBYTEALIGN,
+								 0,0,2000,1000,
+								 NULLHANDLE,
+								 HWND_TOP,
+								 0L,
+								 NULL,
+								 NULL);
+	HWND tmp = WinCreateWindow(frame,
 							   WC_COMBOBOX,
 							   text,
 							   WS_VISIBLE | CBS_DROPDOWN | WS_GROUP,
 							   0,0,2000,1000,
 							   NULLHANDLE,
 	blah->oldproc = WinSubclassWindow(tmp, _comboproc);
 	WinSetWindowPtr(tmp, QWP_USER, blah);
 	dw_window_set_font(tmp, DefaultFont);
 	dw_window_set_color(tmp, DW_CLR_BLACK, DW_CLR_WHITE);
 	dw_window_set_data(tmp, "_dw_comboentry", (void *)last);
+	dw_window_set_data(tmp, "_dw_combo_box", (void *)frame);
 	return tmp;
 }
 /*
 * Create a new button window (widget) to be packed.
 	if(thisbox)
 	{
 		int z;
 		Item *tmpitem, *thisitem = thisbox->items;
 		char tmpbuf[100];
+		HWND frame = (HWND)dw_window_get_data(item, "_dw_combo_box");
 		tmpitem = malloc(sizeof(Item)*(thisbox->count+1));
 		for(z=0;z<thisbox->count;z++)
 		{
 /* Don't set the ownership if it's an entryfield  or spinbutton */
 		WinQueryClassName(item, 99, tmpbuf);
 		if(strncmp(tmpbuf, "#6", 3)!=0 && strncmp(tmpbuf, "#32", 4)!=0)
 			WinSetOwner(item, box);
-		WinSetParent(item, box, FALSE);
+		WinSetParent(frame ? frame : item, box, FALSE);
 	}
 }
 /*
 * Sets the size of a given window (widget).
 	if(thisbox)
 	{
 		int z;
 		Item *tmpitem, *thisitem = thisbox->items;
 		char tmpbuf[100];
+		HWND frame = (HWND)dw_window_get_data(item, "_dw_combo_box");
 		tmpitem = malloc(sizeof(Item)*(thisbox->count+1));
 		for(z=0;z<thisbox->count;z++)
 		{
 		WinQueryClassName(item, 99, tmpbuf);
 		/* Don't set the ownership if it's an entryfield or spinbutton */
 		if(strncmp(tmpbuf, "#6", 3)!=0 && strncmp(tmpbuf, "#32", 4)!=0)
 			WinSetOwner(item, box);
-		WinSetParent(item, box, FALSE);
+		WinSetParent(frame ? frame : item, box, FALSE);
 	}
 }
 /* The following two functions graciously contributed by Peter Nielsen. */
 static ULONG _ParseBuildLevel (char* pchBuffer, ULONG ulSize) {

Mercurial > dwindows

comparison os2/dw.c @ 405:4c084ec3e176