Reflect changes in stc.cpp in stc.cpp.in from which it's generated.

[wxWidgets.git] / src / generic / richtooltipg.cpp

diff --git a/src/generic/richtooltipg.cpp b/src/generic/richtooltipg.cpp
index 282f27e7a94de3a973254db3eed7bcdd8f2f2161..2986f9be312c4499de43b36d5f7c90514271ad0d 100644 (file)
--- a/src/generic/richtooltipg.cpp
+++ b/src/generic/richtooltipg.cpp
@@ -3,7 +3,6 @@
 // Purpose:     Implementation of wxRichToolTip.
 // Author:      Vadim Zeitlin
 // Created:     2011-10-07
 // Purpose:     Implementation of wxRichToolTip.
 // Author:      Vadim Zeitlin
 // Created:     2011-10-07

-// RCS-ID:      $Id$

 // Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////


@@ -232,14 +231,14 @@ public:
         }
     }
 
         }
     }
 

-    void SetPosition(wxRect* rect)
+    void SetPosition(const wxRect* rect)

     {
         wxPoint pos;
 
         if ( !rect || rect->IsEmpty() )
             pos = GetTipPoint();
         else
     {
         wxPoint pos;
 
         if ( !rect || rect->IsEmpty() )
             pos = GetTipPoint();
         else

-            pos = wxPoint( rect->x + rect->width / 2, rect->y + rect->height / 2 );
+            pos = GetParent()->ClientToScreen( wxPoint( rect->x + rect->width / 2, rect->y + rect->height / 2 ) );

 
         // We want our anchor point to coincide with this position so offset
         // the position of the top left corner passed to Move() accordingly.
 
         // We want our anchor point to coincide with this position so offset
         // the position of the top left corner passed to Move() accordingly.


@@ -561,6 +560,8 @@ private:
 
         SetShape(path);
 #else // !wxUSE_GRAPHICS_CONTEXT
 
         SetShape(path);
 #else // !wxUSE_GRAPHICS_CONTEXT

+        wxUnusedVar(tipKind);
+

         int x = contentSize.x/2,
             yApex = 0,
             dy = 0;
         int x = contentSize.x/2,
             yApex = 0,
             dy = 0;


@@ -673,7 +674,7 @@ void wxRichToolTipGenericImpl::SetTitleFont(const wxFont& font)
     m_titleFont = font;
 }
 
     m_titleFont = font;
 }
 

-void wxRichToolTipGenericImpl::ShowFor(wxWindow* win, wxRect* rect = NULL);
+void wxRichToolTipGenericImpl::ShowFor(wxWindow* win, const wxRect* rect)

 {
     // Set the focus to the window the tooltip refers to to make it look active.
     win->SetFocus();
 {
     // Set the focus to the window the tooltip refers to to make it look active.
     win->SetFocus();