cleaning up problems after string changes

[wxWidgets.git] / include / wx / tipwin.h

diff --git a/include/wx/tipwin.h b/include/wx/tipwin.h
index 766f45e7dbdeab420cfd9a35c5fe9a78d2a25553..75588a5a3e1aec2e9b1893b5c20bb69e4237545a 100644 (file)
--- a/include/wx/tipwin.h
+++ b/include/wx/tipwin.h
@@ -7,44 +7,92 @@
 // Created:     10.09.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Created:     10.09.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TIPWIN_H_
 #define _WX_TIPWIN_H_
 
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TIPWIN_H_
 #define _WX_TIPWIN_H_
 

-#ifdef __GNUG__
-    #pragma interface "tipwin.h"
+#if wxUSE_TIPWINDOW
+
+#if wxUSE_POPUPWIN
+    #include "wx/popupwin.h"
+
+    #define wxTipWindowBase wxPopupTransientWindow
+#else
+    #include "wx/frame.h"
+
+    #define wxTipWindowBase wxFrame

 #endif
 #endif

+#include "wx/arrstr.h"

 
 

-#include "wx/frame.h"
+class WXDLLEXPORT wxTipWindowView;

 
 // ----------------------------------------------------------------------------
 // wxTipWindow
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // wxTipWindow
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxTipWindow : public wxFrame
+class WXDLLEXPORT wxTipWindow : public wxTipWindowBase

 {
 public:
 {
 public:

+    // 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,
     wxTipWindow(wxWindow *parent,
                 const wxString& text,

-                wxCoord maxLength = 100);
+                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; }
+
+    // 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:
 
 protected:

+    // called by wxTipWindowView only
+    bool CheckMouseInBounds(const wxPoint& pos);
+

     // event handlers
     // event handlers

-    void OnPaint(wxPaintEvent& event);

     void OnMouseClick(wxMouseEvent& event);
     void OnMouseClick(wxMouseEvent& event);

+
+#if !wxUSE_POPUPWIN

     void OnActivate(wxActivateEvent& event);
     void OnKillFocus(wxFocusEvent& event);
     void OnActivate(wxActivateEvent& event);
     void OnKillFocus(wxFocusEvent& event);

-
-    // calculate the client rect we need to display the text
-    void Adjust(const wxString& text, wxCoord maxLength);
+#else // wxUSE_POPUPWIN
+    virtual void OnDismiss();
+#endif // wxUSE_POPUPWIN/!wxUSE_POPUPWIN

 
 private:
     wxArrayString m_textLines;
     wxCoord m_heightLine;
 
 
 private:
     wxArrayString m_textLines;
     wxCoord m_heightLine;
 

+    wxTipWindowView *m_view;
+
+    wxTipWindow** m_windowPtr;
+    wxRect m_rectBound;
+

     DECLARE_EVENT_TABLE()
     DECLARE_EVENT_TABLE()

+
+    friend class wxTipWindowView;
+
+    DECLARE_NO_COPY_CLASS(wxTipWindow)

 };
 
 };
 

+#endif // wxUSE_TIPWINDOW
+

 #endif // _WX_TIPWIN_H_
 #endif // _WX_TIPWIN_H_