X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..3e1924dd5f5744c3e2a8973de9b3e4f372b7fd85:/src/generic/tipwin.cpp diff --git a/src/generic/tipwin.cpp b/src/generic/tipwin.cpp index 2eba71e722..c64fa5a569 100644 --- a/src/generic/tipwin.cpp +++ b/src/generic/tipwin.cpp @@ -17,25 +17,22 @@ // headers // ---------------------------------------------------------------------------- -// For compilers that support precompilatixon, includes "wx/wx.h". +// For compilers that support precompilation, includes "wx/wx.h". #include "wx/wxprec.h" #ifdef __BORLANDC__ #pragma hdrstop #endif +#if wxUSE_TIPWINDOW + +#include "wx/tipwin.h" + #ifndef WX_PRECOMP #include "wx/dcclient.h" + #include "wx/timer.h" + #include "wx/settings.h" #endif // WX_PRECOMP -#ifdef __WXGTK__ - #include -#endif -#include "wx/tipwin.h" - -#if wxUSE_TIPWINDOW - -#include "wx/timer.h" -#include "wx/settings.h" // ---------------------------------------------------------------------------- // constants @@ -156,8 +153,7 @@ wxTipWindow::wxTipWindow(wxWindow *parent, Position(wxPoint(x, y), wxSize(0,0)); Popup(m_view); #ifdef __WXGTK__ - if (!GTK_WIDGET_HAS_GRAB(m_widget)) - gtk_grab_add( m_widget ); + m_view->CaptureMouse(); #endif #else Move(x, y); @@ -173,8 +169,8 @@ wxTipWindow::~wxTipWindow() } #ifdef wxUSE_POPUPWIN #ifdef __WXGTK__ - if (GTK_WIDGET_HAS_GRAB(m_widget)) - gtk_grab_remove( m_widget ); + if ( m_view->HasCapture() ) + m_view->ReleaseMouse(); #endif #endif } @@ -227,8 +223,8 @@ void wxTipWindow::Close() #if wxUSE_POPUPWIN Show(false); #ifdef __WXGTK__ - if (GTK_WIDGET_HAS_GRAB(m_widget)) - gtk_grab_remove( m_widget ); + if ( m_view->HasCapture() ) + m_view->ReleaseMouse(); #endif Destroy(); #else @@ -315,7 +311,7 @@ void wxTipWindowView::Adjust(const wxString& text, wxCoord maxLength) // take into account the border size and the margins width = 2*(TEXT_MARGIN_X + 1) + widthMax; - height = 2*(TEXT_MARGIN_Y + 1) + m_parent->m_textLines.GetCount()*m_parent->m_heightLine; + height = 2*(TEXT_MARGIN_Y + 1) + wx_truncate_cast(wxCoord, m_parent->m_textLines.GetCount())*m_parent->m_heightLine; m_parent->SetClientSize(width, height); SetSize(0, 0, width, height); } @@ -361,7 +357,7 @@ void wxTipWindowView::OnMouseMove(wxMouseEvent& event) const wxRect& rectBound = m_parent->m_rectBound; if ( rectBound.width && - !rectBound.Inside(ClientToScreen(event.GetPosition())) ) + !rectBound.Contains(ClientToScreen(event.GetPosition())) ) { // mouse left the bounding rect, disappear m_parent->Close();