From ed666328da60b8885b027947c1ac4b6a3c395fcc Mon Sep 17 00:00:00 2001
From: Robin Dunn <robin@alldunn.com>
Date: Mon, 8 Mar 2004 23:28:31 +0000
Subject: [PATCH] Use EDIT_HEIGHT_FROM_CHAR_HEIGHT until something better can
 be done

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26145 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/msw/choice.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/msw/choice.cpp b/src/msw/choice.cpp
index b1809f6c04..e80ff3b166 100644
--- a/src/msw/choice.cpp
+++ b/src/msw/choice.cpp
@@ -532,8 +532,7 @@ wxSize wxChoice::DoGetBestSize() const
     // the combobox should be slightly larger than the widest string
     wChoice += 5*GetCharWidth();
 
-    // +5 is magic but seems to work well
-    return wxSize(wChoice, GetCharHeight() + 5);
+    return wxSize(wChoice, EDIT_HEIGHT_FROM_CHAR_HEIGHT(GetCharHeight()));
 }
 
 WXLRESULT wxChoice::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
-- 
2.45.2