undid the patches which shouldn't (IMHO) have been applied to this branch

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-07-04 17:26:36 +00:00
parent 9cc02d047b
commit 0ef2ebbafc
3 changed files with 13 additions and 50 deletions

View File

@@ -382,9 +382,11 @@ 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 && !(combo->GetWindowStyle() & wxCB_READONLY))
if ( combo )
{
WXHWND hwndComboEdit = combo->GetEditHWND();
WXHWND hwndComboEdit = combo->GetWindowStyle() & wxCB_READONLY
? combo->GetHWND()
: combo->GetEditHWND();
if ( hwndComboEdit )
{
Add(hwndComboEdit);