From 311298e064ec6f1f6a52936fccc78efcd6e2ddae Mon Sep 17 00:00:00 2001
From: Julian Smart <julian@anthemion.co.uk>
Date: Thu, 4 Jul 2002 09:08:59 +0000
Subject: [PATCH] Applied patch from Mark Armstrong <marka@availsolutions.com>
 This patch fixes a debug assertion in tooltips.

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

diff --git a/src/msw/tooltip.cpp b/src/msw/tooltip.cpp
index 930748cdbf..28bafa0c16 100644
--- a/src/msw/tooltip.cpp
+++ b/src/msw/tooltip.cpp
@@ -382,11 +382,9 @@ void wxToolTip::SetWindow(wxWindow *win)
     //     something like this where the derived class can do such things
     //     itself instead of wxToolTip "knowing" about them all
     wxComboBox *combo = wxDynamicCast(control, wxComboBox);
-    if ( combo )
+    if ( combo && !(combo->GetWindowStyle() & wxCB_READONLY))
     {
-        WXHWND hwndComboEdit = combo->GetWindowStyle() & wxCB_READONLY
-                                ? combo->GetHWND()
-                                : combo->GetEditHWND();
+        WXHWND hwndComboEdit = combo->GetEditHWND();
         if ( hwndComboEdit )
         {
             Add(hwndComboEdit);
-- 
2.45.2