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
This commit is contained in:
Julian Smart
2002-07-04 09:08:59 +00:00
parent abc886c577
commit 311298e064

View File

@@ -382,11 +382,9 @@ void wxToolTip::SetWindow(wxWindow *win)
// something like this where the derived class can do such things // something like this where the derived class can do such things
// itself instead of wxToolTip "knowing" about them all // itself instead of wxToolTip "knowing" about them all
wxComboBox *combo = wxDynamicCast(control, wxComboBox); wxComboBox *combo = wxDynamicCast(control, wxComboBox);
if ( combo ) if ( combo && !(combo->GetWindowStyle() & wxCB_READONLY))
{ {
WXHWND hwndComboEdit = combo->GetWindowStyle() & wxCB_READONLY WXHWND hwndComboEdit = combo->GetEditHWND();
? combo->GetHWND()
: combo->GetEditHWND();
if ( hwndComboEdit ) if ( hwndComboEdit )
{ {
Add(hwndComboEdit); Add(hwndComboEdit);