From a4b013c9f2c2588d06f48b07da710e8659142472 Mon Sep 17 00:00:00 2001
From: Robert Shearman <rob@codeweavers.com>
Date: Thu, 21 Oct 2004 20:59:38 +0000
Subject: [PATCH] Always remove WS_BORDER style from ComboBoxEx control.

---
 dlls/comctl32/comboex.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/comctl32/comboex.c b/dlls/comctl32/comboex.c
index 174c110c700..7d8d5ecc98a 100644
--- a/dlls/comctl32/comboex.c
+++ b/dlls/comctl32/comboex.c
@@ -1570,7 +1570,7 @@ static LRESULT COMBOEX_NCCreate (HWND hwnd)
     DWORD oldstyle, newstyle;
 
     oldstyle = (DWORD)GetWindowLongW (hwnd, GWL_STYLE);
-    newstyle = oldstyle & ~(WS_VSCROLL | WS_HSCROLL);
+    newstyle = oldstyle & ~(WS_VSCROLL | WS_HSCROLL | WS_BORDER);
     if (newstyle != oldstyle) {
 	TRACE("req style %08lx, reseting style %08lx\n",
 	      oldstyle, newstyle);