X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9806a0e71eb2190827e93cd463e9682a3b939eee..19e30148e18cc99296b26503c155e5cef59045f4:/src/generic/tipwin.cpp

diff --git a/src/generic/tipwin.cpp b/src/generic/tipwin.cpp
index 1469b554c7..84d8d86f62 100644
--- a/src/generic/tipwin.cpp
+++ b/src/generic/tipwin.cpp
@@ -33,7 +33,11 @@
 #endif // WX_PRECOMP
 
 #include "wx/tipwin.h"
+
+#if wxUSE_TIPWINDOW
+
 #include "wx/timer.h"
+#include "wx/settings.h"
 
 // ----------------------------------------------------------------------------
 // constants
@@ -42,24 +46,12 @@
 static const wxCoord TEXT_MARGIN_X = 3;
 static const wxCoord TEXT_MARGIN_Y = 3;
 
-// ============================================================================
-// implementation
-// ============================================================================
-
 // ----------------------------------------------------------------------------
-// event tables
+// wxTipWindowView
 // ----------------------------------------------------------------------------
 
-BEGIN_EVENT_TABLE(wxTipWindow, wxFrame)
-    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
+class WXDLLEXPORT wxTipWindowView : public wxWindow
 {
 public:
     wxTipWindowView(wxWindow *parent);
@@ -67,56 +59,112 @@ public:
     // event handlers
     void OnPaint(wxPaintEvent& event);
     void OnMouseClick(wxMouseEvent& event);
+    void OnMouseMove(wxMouseEvent& event);
+
+#if !wxUSE_POPUPWIN
     void OnKillFocus(wxFocusEvent& event);
+#endif // wxUSE_POPUPWIN
 
     // calculate the client rect we need to display the text
     void Adjust(const wxString& text, wxCoord maxLength);
 
+private:
+    wxTipWindow* m_parent;
+
+#if !wxUSE_POPUPWIN
     long m_creationTime;
+#endif // !wxUSE_POPUPWIN
 
-  DECLARE_EVENT_TABLE()
+    DECLARE_EVENT_TABLE()
 };
 
+// ============================================================================
+// 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 // !wxUSE_POPUPWIN
 END_EVENT_TABLE()
 
-
 // ----------------------------------------------------------------------------
 // wxTipWindow
 // ----------------------------------------------------------------------------
 
 wxTipWindow::wxTipWindow(wxWindow *parent,
                          const wxString& text,
-                         wxCoord maxLength, wxTipWindow** windowPtr)
+                         wxCoord maxLength,
+                         wxTipWindow** windowPtr,
+                         wxRect *rectBounds)
+#if wxUSE_POPUPWIN
+           : wxPopupTransientWindow(parent)
+#else
            : wxFrame(parent, -1, _T(""),
                      wxDefaultPosition, wxDefaultSize,
-                     wxNO_BORDER | wxFRAME_FLOAT_ON_PARENT)
+                     wxNO_BORDER | wxFRAME_NO_TASKBAR )
+#endif
 {
+    SetTipWindowPtr(windowPtr);
+    if ( rectBounds )
+    {
+        SetBoundingRect(*rectBounds);
+    }
+
     // set colours
-    SetForegroundColour(*wxBLACK);
-    SetBackgroundColour(wxColour(255, 255, 231));
-    // set position and size
+    SetForegroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_INFOTEXT));
+    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_INFOBK));
+
+    // set size, position and show it
+    m_view = new wxTipWindowView(this);
+    m_view->Adjust(text, maxLength);
+    m_view->SetFocus();
+
     int x, y;
     wxGetMousePosition(&x, &y);
-    Move(x, y + 20);
 
-    wxTipWindowView* tipWindowView = new wxTipWindowView(this);
-    tipWindowView->Adjust(text, maxLength);
-
-    m_windowPtr = windowPtr;
+    // 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), wxSize(0, 0));
+    Popup(m_view);
+#else
+    Move(x, y);
     Show(TRUE);
-    tipWindowView->SetFocus();
+#endif
 }
 
 wxTipWindow::~wxTipWindow()
 {
-    if (m_windowPtr)
+    if ( m_windowPtr )
     {
         *m_windowPtr = NULL;
     }
@@ -127,6 +175,15 @@ void wxTipWindow::OnMouseClick(wxMouseEvent& WXUNUSED(event))
     Close();
 }
 
+#if wxUSE_POPUPWIN
+
+void wxTipWindow::OnDismiss()
+{
+    Close();
+}
+
+#else // !wxUSE_POPUPWIN
+
 void wxTipWindow::OnActivate(wxActivateEvent& event)
 {
     if (!event.GetActive())
@@ -143,24 +200,51 @@ void wxTipWindow::OnKillFocus(wxFocusEvent& WXUNUSED(event))
 #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);
+    Destroy();
+#else
+    wxFrame::Close();
+#endif
+}
+
 // ----------------------------------------------------------------------------
 // wxTipWindowView
 // ----------------------------------------------------------------------------
 
 wxTipWindowView::wxTipWindowView(wxWindow *parent)
-           : wxWindow(parent, -1,
-                     wxDefaultPosition, wxDefaultSize,
-                     wxNO_BORDER)
+               : wxWindow(parent, -1,
+                          wxDefaultPosition, wxDefaultSize,
+                          wxNO_BORDER)
 {
     // set colours
-    SetForegroundColour(*wxBLACK);
-    SetBackgroundColour(wxColour(255, 255, 231));
+    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;
 }
 
 void wxTipWindowView::Adjust(const wxString& text, wxCoord maxLength)
 {
-    wxTipWindow* parent = (wxTipWindow*) GetParent();
     wxClientDC dc(this);
     dc.SetFont(GetFont());
 
@@ -169,7 +253,7 @@ void wxTipWindowView::Adjust(const wxString& text, wxCoord maxLength)
     wxString current;
     wxCoord height, width,
             widthMax = 0;
-    parent->m_heightLine = 0;
+    m_parent->m_heightLine = 0;
 
     bool breakLine = FALSE;
     for ( const wxChar *p = text.c_str(); ; p++ )
@@ -180,10 +264,10 @@ void wxTipWindowView::Adjust(const wxString& text, wxCoord maxLength)
             if ( width > widthMax )
                 widthMax = width;
 
-            if ( height > parent->m_heightLine )
-                parent->m_heightLine = height;
+            if ( height > m_parent->m_heightLine )
+                m_parent->m_heightLine = height;
 
-            parent->m_textLines.Add(current);
+            m_parent->m_textLines.Add(current);
 
             if ( !*p )
             {
@@ -197,7 +281,7 @@ void wxTipWindowView::Adjust(const wxString& text, wxCoord maxLength)
         else if ( breakLine && (*p == _T(' ') || *p == _T('\t')) )
         {
             // word boundary - break the line here
-            parent->m_textLines.Add(current);
+            m_parent->m_textLines.Add(current);
             current.clear();
             breakLine = FALSE;
         }
@@ -211,22 +295,20 @@ void wxTipWindowView::Adjust(const wxString& text, wxCoord maxLength)
             if ( width > widthMax )
                 widthMax = width;
 
-            if ( height > parent->m_heightLine )
-                parent->m_heightLine = height;
+            if ( height > m_parent->m_heightLine )
+                m_parent->m_heightLine = height;
         }
     }
 
     // take into account the border size and the margins
-    GetParent()->SetClientSize(2*(TEXT_MARGIN_X + 1) + widthMax,
-                  2*(TEXT_MARGIN_Y + 1) + parent->m_textLines.GetCount()*parent->m_heightLine);
+    width  = 2*(TEXT_MARGIN_X + 1) + widthMax;
+    height = 2*(TEXT_MARGIN_Y + 1) + m_parent->m_textLines.GetCount()*m_parent->m_heightLine;
+    m_parent->SetClientSize(width, height);
+    SetSize(0, 0, width, height);
 }
 
 void wxTipWindowView::OnPaint(wxPaintEvent& WXUNUSED(event))
 {
-    wxTipWindow* parent = (wxTipWindow*) GetParent();
-    if (!parent)
-      return;
-
     wxPaintDC dc(this);
 
     wxRect rect;
@@ -236,39 +318,54 @@ void wxTipWindowView::OnPaint(wxPaintEvent& WXUNUSED(event))
 
     // first filll the background
     dc.SetBrush(wxBrush(GetBackgroundColour(), wxSOLID));
-
-    // 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.SetPen( wxPen(GetForegroundColour(), 1, wxSOLID) );
     dc.DrawRectangle(rect);
 
     // and then draw the text line by line
+    dc.SetTextBackground(GetBackgroundColour());
+    dc.SetTextForeground(GetForegroundColour());
     dc.SetFont(GetFont());
 
     wxPoint pt;
     pt.x = TEXT_MARGIN_X;
     pt.y = TEXT_MARGIN_Y;
-    size_t count = parent->m_textLines.GetCount();
+    size_t count = m_parent->m_textLines.GetCount();
     for ( size_t n = 0; n < count; n++ )
     {
-        dc.DrawText(parent->m_textLines[n], pt);
+        dc.DrawText(m_parent->m_textLines[n], pt);
 
-        pt.y += parent->m_heightLine;
+        pt.y += m_parent->m_heightLine;
     }
 }
 
 void wxTipWindowView::OnMouseClick(wxMouseEvent& WXUNUSED(event))
 {
-    GetParent()->Close();
+    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))
 {
     // Workaround the kill focus event happening just after creation in wxGTK
     if (wxGetLocalTime() > m_creationTime + 1)
-        GetParent()->Close();
+        m_parent->Close();
 }
+#endif // !wxUSE_POPUPWIN
 
+#endif // wxUSE_TIPWINDOW