popupmenu itemsize

[Christian Kristukat]

Hi,
I suspect that this again is a dirty patch but it helps in working with
Microcal Origin. Maybe a more skilled person than me finds the real origin of
this problem.
At one point in the program a popup menu opens but only the items' width is
calculated correctly, the height is not, in fact it is equal zero. For that
case I added an arbitrarily chosen height of 12 points and it works fine.
Here's the patch:

Index: controls/menu.c
===================================================================
RCS file: /home/wine/wine/controls/menu.c,v
retrieving revision 1.161
diff -u -r1.161 menu.c
--- controls/menu.c	16 Jan 2003 01:17:34 -0000	1.161
+++ controls/menu.c	13 Feb 2003 14:17:55 -0000
@@ -896,6 +896,9 @@
         }
         else
             lpitem->rect.bottom += mis.itemHeight;
+            if (lpitem->rect.top == lpitem->rect.bottom)
+                lpitem->rect.bottom += 12;
+

 	TRACE("id=%04x size=%dx%d\n",
                      lpitem->wID, mis.itemWidth, mis.itemHeight);

PS: By the way: every cvs operation (update, diff) hangs after processing the
last directory. However it seems to be complete and pressing CTRL-C seems not
to corrupt anything. Any ideas?


Regards, Christian