X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8962e1d9383d615ea48979cd76bd53d5aa5b3026..10769d8c47c21fe0ec5034726791a5ad4cf19475:/include/wx/tipwin.h?ds=sidebyside

diff --git a/include/wx/tipwin.h b/include/wx/tipwin.h
index ce4e3ec69a..ceab97f7fe 100644
--- a/include/wx/tipwin.h
+++ b/include/wx/tipwin.h
@@ -17,42 +17,83 @@
     #pragma interface "tipwin.h"
 #endif
 
-#include "wx/popupwin.h"
+#if wxUSE_TIPWINDOW
 
 #if wxUSE_POPUPWIN
+    #include "wx/popupwin.h"
+
+    #define wxTipWindowBase wxPopupTransientWindow
+#else
+    #include "wx/frame.h"
+
+    #define wxTipWindowBase wxFrame
+#endif
+
+class WXDLLEXPORT wxTipWindowView;
+
 // ----------------------------------------------------------------------------
 // wxTipWindow
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxTipWindow : public wxPopupTransientWindow
+class WXDLLEXPORT wxTipWindow : public wxTipWindowBase
 {
 public:
-    // Supply windowPtr for it to null the given address
-    // when the window has closed.
+    // the mandatory ctor parameters are: the parent window and the text to
+    // show
+    //
+    // optionally you may also specify the length at which the lines are going
+    // to be broken in rows (100 pixels by default)
+    //
+    // windowPtr and rectBound are just passed to SetTipWindowPtr() and
+    // SetBoundingRect() - see below
     wxTipWindow(wxWindow *parent,
                 const wxString& text,
-                wxCoord maxLength = 100, wxTipWindow** windowPtr = NULL);
-    ~wxTipWindow();
+                wxCoord maxLength = 100,
+                wxTipWindow** windowPtr = NULL,
+                wxRect *rectBound = NULL);
+
+    virtual ~wxTipWindow();
 
+    // If windowPtr is not NULL the given address will be NULLed when the
+    // window has closed
     void SetTipWindowPtr(wxTipWindow** windowPtr) { m_windowPtr = windowPtr; }
 
-    // calculate the client rect we need to display the text
-    void Adjust(const wxString& text, wxCoord maxLength);
+    // If rectBound is not NULL, the window will disappear automatically when
+    // the mouse leave the specified rect: note that rectBound should be in the
+    // screen coordinates!
+    void SetBoundingRect(const wxRect& rectBound);
 
+    // Hide and destroy the window
     void Close();
 
 protected:
+    // called by wxTipWindowView only
+    bool CheckMouseInBounds(const wxPoint& pos);
+
     // event handlers
     void OnMouseClick(wxMouseEvent& event);
-    void OnPaint(wxPaintEvent& event);
+
+#if !wxUSE_POPUPWIN
+    void OnActivate(wxActivateEvent& event);
+    void OnKillFocus(wxFocusEvent& event);
+#else // wxUSE_POPUPWIN
+    virtual void OnDismiss();
+#endif // wxUSE_POPUPWIN/!wxUSE_POPUPWIN
 
 private:
     wxArrayString m_textLines;
     wxCoord m_heightLine;
+
+    wxTipWindowView *m_view;
+
     wxTipWindow** m_windowPtr;
+    wxRect m_rectBound;
 
     DECLARE_EVENT_TABLE()
+
+    friend class wxTipWindowView;
 };
 
-#endif // wxUSE_POPUPWIN
+#endif // wxUSE_TIPWINDOW
+
 #endif // _WX_TIPWIN_H_