X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/01fa3fe74d0fadc5126fc27fb5729f08b10da606..3dd9b88ac26caa8dbcc26c7fafc10cd886fc97ac:/src/generic/tipwin.cpp diff --git a/src/generic/tipwin.cpp b/src/generic/tipwin.cpp index 6dc9d80ac6..9937d35037 100644 --- a/src/generic/tipwin.cpp +++ b/src/generic/tipwin.cpp @@ -33,6 +33,7 @@ #endif // WX_PRECOMP #include "wx/tipwin.h" +#include "wx/timer.h" // ---------------------------------------------------------------------------- // constants @@ -50,43 +51,126 @@ static const wxCoord TEXT_MARGIN_Y = 3; // ---------------------------------------------------------------------------- BEGIN_EVENT_TABLE(wxTipWindow, wxFrame) - EVT_PAINT(wxTipWindow::OnPaint) - EVT_LEFT_DOWN(wxTipWindow::OnMouseClick) EVT_RIGHT_DOWN(wxTipWindow::OnMouseClick) EVT_MIDDLE_DOWN(wxTipWindow::OnMouseClick) + EVT_KILL_FOCUS(wxTipWindow::OnKillFocus) + EVT_ACTIVATE(wxTipWindow::OnActivate) +END_EVENT_TABLE() + +// Viewer window to put in the frame +class wxTipWindowView: public wxWindow +{ +public: + wxTipWindowView(wxWindow *parent); + + // event handlers + void OnPaint(wxPaintEvent& event); + void OnMouseClick(wxMouseEvent& event); + void OnKillFocus(wxFocusEvent& event); + + // calculate the client rect we need to display the text + void Adjust(const wxString& text, wxCoord maxLength); + + long m_creationTime; + + DECLARE_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_KILL_FOCUS(wxTipWindowView::OnKillFocus) END_EVENT_TABLE() + // ---------------------------------------------------------------------------- // wxTipWindow // ---------------------------------------------------------------------------- wxTipWindow::wxTipWindow(wxWindow *parent, const wxString& text, - wxCoord maxLength) + wxCoord maxLength, wxTipWindow** windowPtr) : wxFrame(parent, -1, _T(""), wxDefaultPosition, wxDefaultSize, wxNO_BORDER | wxFRAME_FLOAT_ON_PARENT) { // set colours SetForegroundColour(*wxBLACK); +#if !defined(__WXPM__) SetBackgroundColour(wxColour(0xc3ffff)); - +#else + // What is 0xc3ffff, try some legable documentation for those of us who don't memorize hex codes?? + SetBackgroundColour(wxColour(*wxWHITE)); +#endif // set position and size int x, y; wxGetMousePosition(&x, &y); Move(x, y + 20); - Adjust(text, maxLength); + wxTipWindowView* tipWindowView = new wxTipWindowView(this); + tipWindowView->Adjust(text, maxLength); - // capture mouse as we want to dismiss the window when it is clicked - CaptureMouse(); + m_windowPtr = windowPtr; Show(TRUE); + tipWindowView->SetFocus(); +} + +wxTipWindow::~wxTipWindow() +{ + if (m_windowPtr) + { + *m_windowPtr = NULL; + } +} + +void wxTipWindow::OnMouseClick(wxMouseEvent& WXUNUSED(event)) +{ + Close(); +} + +void wxTipWindow::OnActivate(wxActivateEvent& event) +{ + if (!event.GetActive()) + Close(); } -void wxTipWindow::Adjust(const wxString& text, wxCoord maxLength) +void wxTipWindow::OnKillFocus(wxFocusEvent& WXUNUSED(event)) { + // Under Windows at least, we will get this immediately + // because when the view window is focussed, the + // tip window goes out of focus. +#ifdef __WXGTK__ + Close(); +#endif +} + +// ---------------------------------------------------------------------------- +// wxTipWindowView +// ---------------------------------------------------------------------------- + +wxTipWindowView::wxTipWindowView(wxWindow *parent) + : wxWindow(parent, -1, + wxDefaultPosition, wxDefaultSize, + wxNO_BORDER) +{ + // set colours + SetForegroundColour(*wxBLACK); +#if !defined(__WXPM__) + SetBackgroundColour(wxColour(0xc3ffff)); +#else + // What is 0xc3ffff, try some legable documentation for those of us who don't memorize hex codes?? + SetBackgroundColour(wxColour(*wxWHITE)); +#endif + m_creationTime = wxGetLocalTime(); +} + +void wxTipWindowView::Adjust(const wxString& text, wxCoord maxLength) +{ + wxTipWindow* parent = (wxTipWindow*) GetParent(); wxClientDC dc(this); dc.SetFont(GetFont()); @@ -95,7 +179,7 @@ void wxTipWindow::Adjust(const wxString& text, wxCoord maxLength) wxString current; wxCoord height, width, widthMax = 0; - m_heightLine = 0; + parent->m_heightLine = 0; bool breakLine = FALSE; for ( const wxChar *p = text.c_str(); ; p++ ) @@ -106,10 +190,10 @@ void wxTipWindow::Adjust(const wxString& text, wxCoord maxLength) if ( width > widthMax ) widthMax = width; - if ( height > m_heightLine ) - m_heightLine = height; + if ( height > parent->m_heightLine ) + parent->m_heightLine = height; - m_textLines.Add(current); + parent->m_textLines.Add(current); if ( !*p ) { @@ -123,7 +207,7 @@ void wxTipWindow::Adjust(const wxString& text, wxCoord maxLength) else if ( breakLine && (*p == _T(' ') || *p == _T('\t')) ) { // word boundary - break the line here - m_textLines.Add(current); + parent->m_textLines.Add(current); current.clear(); breakLine = FALSE; } @@ -137,18 +221,22 @@ void wxTipWindow::Adjust(const wxString& text, wxCoord maxLength) if ( width > widthMax ) widthMax = width; - if ( height > m_heightLine ) - m_heightLine = height; + if ( height > parent->m_heightLine ) + parent->m_heightLine = height; } } // take into account the border size and the margins - SetClientSize(2*(TEXT_MARGIN_X + 1) + widthMax, - 2*(TEXT_MARGIN_Y + 1) + m_textLines.GetCount()*m_heightLine); + GetParent()->SetClientSize(2*(TEXT_MARGIN_X + 1) + widthMax, + 2*(TEXT_MARGIN_Y + 1) + parent->m_textLines.GetCount()*parent->m_heightLine); } -void wxTipWindow::OnPaint(wxPaintEvent& event) +void wxTipWindowView::OnPaint(wxPaintEvent& WXUNUSED(event)) { + wxTipWindow* parent = (wxTipWindow*) GetParent(); + if (!parent) + return; + wxPaintDC dc(this); wxRect rect; @@ -158,7 +246,13 @@ void wxTipWindow::OnPaint(wxPaintEvent& event) // first filll the background dc.SetBrush(wxBrush(GetBackgroundColour(), wxSOLID)); - dc.SetPen(*wxBLACK_PEN); + + // Under Windows, you apparently get a thin black border whether you like it or not :-( +#ifdef __WXMSW__ + dc.SetPen( * wxTRANSPARENT_PEN ); +#else + dc.SetPen( * wxBLACK_PEN ); +#endif dc.DrawRectangle(rect); // and then draw the text line by line @@ -167,18 +261,24 @@ void wxTipWindow::OnPaint(wxPaintEvent& event) wxPoint pt; pt.x = TEXT_MARGIN_X; pt.y = TEXT_MARGIN_Y; - size_t count = m_textLines.GetCount(); + size_t count = parent->m_textLines.GetCount(); for ( size_t n = 0; n < count; n++ ) { - dc.DrawText(m_textLines[n], pt); + dc.DrawText(parent->m_textLines[n], pt); - pt.y += m_heightLine; + pt.y += parent->m_heightLine; } } -void wxTipWindow::OnMouseClick(wxMouseEvent& event) +void wxTipWindowView::OnMouseClick(wxMouseEvent& WXUNUSED(event)) { - ReleaseMouse(); + GetParent()->Close(); +} - Close(); +void wxTipWindowView::OnKillFocus(wxFocusEvent& WXUNUSED(event)) +{ + // Workaround the kill focus event happening just after creation in wxGTK + if (wxGetLocalTime() > m_creationTime + 1) + GetParent()->Close(); } +