X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d3feb55c4990a28bbf3c43c239865a958dd6de62..ad653fa23069c5d9378247084f03c9a718c3ad62:/src/generic/richtooltipg.cpp diff --git a/src/generic/richtooltipg.cpp b/src/generic/richtooltipg.cpp index 282f27e7a9..3d6f0211a5 100644 --- a/src/generic/richtooltipg.cpp +++ b/src/generic/richtooltipg.cpp @@ -232,14 +232,14 @@ public: } } - void SetPosition(wxRect* rect) + void SetPosition(const wxRect* rect) { 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. @@ -561,6 +561,8 @@ private: SetShape(path); #else // !wxUSE_GRAPHICS_CONTEXT + wxUnusedVar(tipKind); + int x = contentSize.x/2, yApex = 0, dy = 0; @@ -673,7 +675,7 @@ void wxRichToolTipGenericImpl::SetTitleFont(const wxFont& 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();