[Wine-patches] Revert "fix owner drawn menu in Konsultant (close eterbug #489 again)"

Konstantin Kondratyuk =?iso-8859-1?q?kondratyuk_=CE=C1_etersoft=2Eru?=
Пт Апр 10 14:35:01 MSD 2009


Хак не нужен, потому что
1) сейчас всё равно не решает проблему с wine98
2) проблема решена запуском Консультанта на winexp

-- 
Best regards,
Konstantin Kondratyuk.
----------- следующая часть -----------
From 8a23bfcb9ca709b43f68c25d125a3a01fd860c06 Mon Sep 17 00:00:00 2001
From: Konstantin Kondratyuk <kondratyuk на etersoft.ru>
Date: Fri, 10 Apr 2009 14:24:51 +0400
Subject: [PATCH] Revert "fix owner drawn menu in Konsultant (close eterbug #489 again)"

This reverts commit 850a08ad409be894552bd2a265fa2d91048c3228.
---
 dlls/user32/menu.c |    7 -------
 1 files changed, 0 insertions(+), 7 deletions(-)

diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c
index a657d30..5d962d2 100644
--- a/dlls/user32/menu.c
+++ b/dlls/user32/menu.c
@@ -1092,13 +1092,6 @@ static void MENU_CalcItemSize( HDC hdc, MENUITEM *lpitem, HWND hwndOwner,
          * width of a menufont character to the width of an owner-drawn menu. 
          */
         lpitem->rect.right += mis.itemWidth + 2 * menucharsize.cx;
-
-        /* Etersoft hack for #489 (only under Win9x)
-           TODO: Consult with Konsultant about the stange behaviour. See comment above this. */
-        if (!(GetVersion() & 0x80000000))
-            if (lpitem->text && strchrW( lpitem->text, '\t' ) != NULL)
-                lpitem->rect.right += 15 * menucharsize.cx;
-
         if (menuBar) {
             /* under at least win95 you seem to be given a standard
                height for the menu and the height value is ignored */
-- 
1.6.1.3.GIT



Подробная информация о списке рассылки Wine-patches