X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3c3b6f606364ae8bd86eeeb3e129636c5294ea85..3cca1b3d8b187098cb67460fb2fc8115963fd2b9:/src/msw/richtooltip.cpp?ds=sidebyside

diff --git a/src/msw/richtooltip.cpp b/src/msw/richtooltip.cpp
index 3cc679abff..9a50ab2271 100644
--- a/src/msw/richtooltip.cpp
+++ b/src/msw/richtooltip.cpp
@@ -151,13 +151,13 @@ public:
         wxRichToolTipGenericImpl::SetTitleFont(font);
     }
 
-    virtual void ShowFor(wxWindow* win)
+    virtual void ShowFor(wxWindow* win, const wxRect* rect)
     {
         // TODO: We could use native tooltip control to show native balloon
         //       tooltips for any window but right now we use the simple
         //       EM_SHOWBALLOONTIP API which can only be used with text
         //       controls.
-        if ( m_canUseNative )
+        if ( m_canUseNative && !rect )
         {
             wxTextCtrl* const text = wxDynamicCast(win, wxTextCtrl);
             if ( text )
@@ -175,7 +175,7 @@ public:
         // Don't set m_canUseNative to false here, we could be able to use the
         // native tooltips if we're called for a different window the next
         // time.
-        wxRichToolTipGenericImpl::ShowFor(win);
+        wxRichToolTipGenericImpl::ShowFor(win, rect);
     }
 
 private: