X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a756f210019dd5b51331b7181c816d3882146a30..c3eeb758b7790948751f547fd5ef803a75b803a4:/src/generic/tipwin.cpp?ds=sidebyside diff --git a/src/generic/tipwin.cpp b/src/generic/tipwin.cpp index 01c0e5151e..17093b2d9e 100644 --- a/src/generic/tipwin.cpp +++ b/src/generic/tipwin.cpp @@ -6,7 +6,7 @@ // Created: 10.09.00 // RCS-ID: $Id$ // Copyright: (c) 2000 Vadim Zeitlin -// Licence: wxWindows license +// Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -17,7 +17,7 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "tipwin.h" #endif @@ -31,7 +31,9 @@ #ifndef WX_PRECOMP #include "wx/dcclient.h" #endif // WX_PRECOMP - +#ifdef __WXGTK__ + #include +#endif #include "wx/tipwin.h" #if wxUSE_TIPWINDOW @@ -46,31 +48,12 @@ static const wxCoord TEXT_MARGIN_X = 3; static const wxCoord TEXT_MARGIN_Y = 3; -// ============================================================================ -// implementation -// ============================================================================ - // ---------------------------------------------------------------------------- -// event tables +// wxTipWindowView // ---------------------------------------------------------------------------- -#if wxUSE_POPUPWIN -BEGIN_EVENT_TABLE(wxTipWindow, wxPopupTransientWindow) -#else -BEGIN_EVENT_TABLE(wxTipWindow, wxFrame) -#endif - EVT_LEFT_DOWN(wxTipWindow::OnMouseClick) - EVT_RIGHT_DOWN(wxTipWindow::OnMouseClick) - EVT_MIDDLE_DOWN(wxTipWindow::OnMouseClick) -#if !wxUSE_POPUPWIN - EVT_KILL_FOCUS(wxTipWindow::OnKillFocus) - EVT_ACTIVATE(wxTipWindow::OnActivate) -#endif -END_EVENT_TABLE() - - // Viewer window to put in the frame -class wxTipWindowView: public wxWindow +class WXDLLEXPORT wxTipWindowView : public wxWindow { public: wxTipWindowView(wxWindow *parent); @@ -78,27 +61,57 @@ public: // event handlers void OnPaint(wxPaintEvent& event); void OnMouseClick(wxMouseEvent& event); + void OnMouseMove(wxMouseEvent& event); + #if !wxUSE_POPUPWIN void OnKillFocus(wxFocusEvent& event); -#endif +#endif // wxUSE_POPUPWIN + // calculate the client rect we need to display the text void Adjust(const wxString& text, wxCoord maxLength); private: - long m_creationTime; wxTipWindow* m_parent; - DECLARE_EVENT_TABLE() +#if !wxUSE_POPUPWIN + long m_creationTime; +#endif // !wxUSE_POPUPWIN + + DECLARE_EVENT_TABLE() + DECLARE_NO_COPY_CLASS(wxTipWindowView) }; +// ============================================================================ +// implementation +// ============================================================================ + +// ---------------------------------------------------------------------------- +// event tables +// ---------------------------------------------------------------------------- + +BEGIN_EVENT_TABLE(wxTipWindow, wxTipWindowBase) + EVT_LEFT_DOWN(wxTipWindow::OnMouseClick) + EVT_RIGHT_DOWN(wxTipWindow::OnMouseClick) + EVT_MIDDLE_DOWN(wxTipWindow::OnMouseClick) + +#if !wxUSE_POPUPWIN + EVT_KILL_FOCUS(wxTipWindow::OnKillFocus) + EVT_ACTIVATE(wxTipWindow::OnActivate) +#endif // !wxUSE_POPUPWIN +END_EVENT_TABLE() + BEGIN_EVENT_TABLE(wxTipWindowView, wxWindow) EVT_PAINT(wxTipWindowView::OnPaint) + EVT_LEFT_DOWN(wxTipWindowView::OnMouseClick) EVT_RIGHT_DOWN(wxTipWindowView::OnMouseClick) EVT_MIDDLE_DOWN(wxTipWindowView::OnMouseClick) + + EVT_MOTION(wxTipWindowView::OnMouseMove) + #if !wxUSE_POPUPWIN EVT_KILL_FOCUS(wxTipWindowView::OnKillFocus) -#endif +#endif // !wxUSE_POPUPWIN END_EVENT_TABLE() // ---------------------------------------------------------------------------- @@ -107,7 +120,9 @@ END_EVENT_TABLE() wxTipWindow::wxTipWindow(wxWindow *parent, const wxString& text, - wxCoord maxLength, wxTipWindow** windowPtr) + wxCoord maxLength, + wxTipWindow** windowPtr, + wxRect *rectBounds) #if wxUSE_POPUPWIN : wxPopupTransientWindow(parent) #else @@ -116,39 +131,56 @@ wxTipWindow::wxTipWindow(wxWindow *parent, wxNO_BORDER | wxFRAME_NO_TASKBAR ) #endif { - m_windowPtr = windowPtr; + SetTipWindowPtr(windowPtr); + if ( rectBounds ) + { + SetBoundingRect(*rectBounds); + } // set colours - SetForegroundColour(*wxBLACK); - -#ifdef __WXMSW__ - wxColour bkCol(wxSystemSettings::GetColour(wxSYS_COLOUR_INFOBK)); -#else - wxColour bkCol(wxColour(255, 255, 225)); -#endif - SetBackgroundColour(bkCol); + SetForegroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_INFOTEXT)); + SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_INFOBK)); // set size, position and show it - wxTipWindowView* tipWindowView = new wxTipWindowView(this); - tipWindowView->Adjust(text, maxLength); - tipWindowView->SetFocus(); + m_view = new wxTipWindowView(this); + m_view->Adjust(text, maxLength); + m_view->SetFocus(); + int x, y; wxGetMousePosition(&x, &y); + + // we want to show the tip below the mouse, not over it + // + // NB: the reason we use "/ 2" here is that we don't know where the current + // cursors hot spot is... it would be nice if we could find this out + // though + y += wxSystemSettings::GetMetric(wxSYS_CURSOR_Y) / 2; + #if wxUSE_POPUPWIN - Position(wxPoint(x, y+10), wxSize(0,0)); - Popup(tipWindowView); + Position(wxPoint(x, y), wxSize(0, 0)); + Popup(m_view); + #ifdef __WXGTK__ + if (!GTK_WIDGET_HAS_GRAB(m_widget)) + gtk_grab_add( m_widget ); + #endif #else - Move(x, y + 10); + Move(x, y); Show(TRUE); #endif } wxTipWindow::~wxTipWindow() { - if (m_windowPtr) + if ( m_windowPtr ) { *m_windowPtr = NULL; } + #ifdef wxUSE_POPUPWIN + #ifdef __WXGTK__ + if (GTK_WIDGET_HAS_GRAB(m_widget)) + gtk_grab_remove( m_widget ); + #endif + #endif } void wxTipWindow::OnMouseClick(wxMouseEvent& WXUNUSED(event)) @@ -156,7 +188,15 @@ void wxTipWindow::OnMouseClick(wxMouseEvent& WXUNUSED(event)) Close(); } -#if !wxUSE_POPUPWIN +#if wxUSE_POPUPWIN + +void wxTipWindow::OnDismiss() +{ + Close(); +} + +#else // !wxUSE_POPUPWIN + void wxTipWindow::OnActivate(wxActivateEvent& event) { if (!event.GetActive()) @@ -172,13 +212,28 @@ void wxTipWindow::OnKillFocus(wxFocusEvent& WXUNUSED(event)) Close(); #endif } -#endif +#endif // wxUSE_POPUPWIN // !wxUSE_POPUPWIN + +void wxTipWindow::SetBoundingRect(const wxRect& rectBound) +{ + m_rectBound = rectBound; +} void wxTipWindow::Close() { + if ( m_windowPtr ) + { + *m_windowPtr = NULL; + m_windowPtr = NULL; + } + #if wxUSE_POPUPWIN Show(FALSE); + #ifdef __WXGTK__ + if (GTK_WIDGET_HAS_GRAB(m_widget)) + gtk_grab_remove( m_widget ); + #endif Destroy(); #else wxFrame::Close(); @@ -190,19 +245,18 @@ void wxTipWindow::Close() // ---------------------------------------------------------------------------- wxTipWindowView::wxTipWindowView(wxWindow *parent) - : wxWindow(parent, -1, - wxDefaultPosition, wxDefaultSize, - wxNO_BORDER) + : wxWindow(parent, -1, + wxDefaultPosition, wxDefaultSize, + wxNO_BORDER) { // set colours - SetForegroundColour(*wxBLACK); -#ifdef __WXMSW__ - wxColour bkCol(wxSystemSettings::GetColour(wxSYS_COLOUR_INFOBK)); -#else - wxColour bkCol(wxColour(255, 255, 225)); -#endif - SetBackgroundColour(bkCol); + SetForegroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_INFOTEXT)); + SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_INFOBK)); + +#if !wxUSE_POPUPWIN m_creationTime = wxGetLocalTime(); +#endif // !wxUSE_POPUPWIN + m_parent = (wxTipWindow*)parent; } @@ -306,6 +360,22 @@ void wxTipWindowView::OnMouseClick(wxMouseEvent& WXUNUSED(event)) m_parent->Close(); } +void wxTipWindowView::OnMouseMove(wxMouseEvent& event) +{ + const wxRect& rectBound = m_parent->m_rectBound; + + if ( rectBound.width && + !rectBound.Inside(ClientToScreen(event.GetPosition())) ) + { + // mouse left the bounding rect, disappear + m_parent->Close(); + } + else + { + event.Skip(); + } +} + #if !wxUSE_POPUPWIN void wxTipWindowView::OnKillFocus(wxFocusEvent& WXUNUSED(event)) { @@ -313,6 +383,6 @@ void wxTipWindowView::OnKillFocus(wxFocusEvent& WXUNUSED(event)) if (wxGetLocalTime() > m_creationTime + 1) m_parent->Close(); } -#endif +#endif // !wxUSE_POPUPWIN -#endif +#endif // wxUSE_TIPWINDOW