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 5a493a4d3ef99055ea3869cedba1314cd4de6561..bb0a2ba45c180514c5cd2774243e10f1800896fc 100644 (file)
--- 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 853b96ac633d751858aabe1d71b5c41ee5d5fe38..23ad01cbd4c9e07e3a0c2ad016ed14be3722a0e7 100644 (file)
--- 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