From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 5 Apr 2012 13:55:56 +0000 (+0000)
Subject: Fix handling of the main window of composite controls in wxMSW wxToolTip.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/5e0b09554d03e088c4a4e3729f2fbcac35ca91d9

Fix handling of the main window of composite controls in wxMSW wxToolTip.

The main window itself should be added using DoAddHWND() and not
AddOtherWindow() as it is not, precisely, "other". This fixes removing and
updating it twice unnecessarily.

Closes #14184.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71097 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/docs/changes.txt b/docs/changes.txt
index 5a493a4d3e..bb0a2ba45c 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -520,6 +520,7 @@ MSW:
 - Add support for horizontal mouse wheel events (Lauri Nurmi).
 - Implement wxGraphicsContext::SetInterpolationQuality() (Eric Jensen).
 - Fix coordinate handling in wxDC::Blit() when source DC is a DIB.
+- Fix handling of composite windows in wxToolTip (Armel Asselin).
 
 OSX:
 
diff --git a/src/msw/tooltip.cpp b/src/msw/tooltip.cpp
index 853b96ac63..23ad01cbd4 100644
--- a/src/msw/tooltip.cpp
+++ b/src/msw/tooltip.cpp
@@ -502,7 +502,7 @@ void wxToolTip::SetWindow(wxWindow *win)
     // add the window itself
     if ( m_window )
     {
-        AddOtherWindow(m_window->GetHWND());
+        DoAddHWND(m_window->GetHWND());
     }
 #if !defined(__WXUNIVERSAL__)
     // and all of its subcontrols (e.g. radio buttons in a radiobox) as well