fixed VC++ compilation

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

diff --git a/include/wx/tipwin.h b/include/wx/tipwin.h
index 37591de4468b65db7ac4047bac4f008094e95348..8a274e5794662df48dec8b00f118382fbbb9f158 100644 (file)
--- a/include/wx/tipwin.h
+++ b/include/wx/tipwin.h
@@ -17,15 +17,16 @@
     #pragma interface "tipwin.h"
 #endif
 
-#include "wx/frame.h"
+#include "wx/popupwin.h"
+
+#if wxUSE_POPUPWIN
 
 // ----------------------------------------------------------------------------
 // wxTipWindow
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxTipWindow : public wxFrame
+class WXDLLEXPORT wxTipWindow : public wxPopupTransientWindow
 {
-    friend class wxTipWindowView;
 public:
     // Supply windowPtr for it to null the given address
     // when the window has closed.
@@ -36,11 +37,15 @@ public:
 
     void SetTipWindowPtr(wxTipWindow** windowPtr) { m_windowPtr = windowPtr; }
 
+    // calculate the client rect we need to display the text
+    void Adjust(const wxString& text, wxCoord maxLength);
+
+    void Close();
+
 protected:
     // event handlers
     void OnMouseClick(wxMouseEvent& event);
-    void OnActivate(wxActivateEvent& event);
-    void OnKillFocus(wxFocusEvent& event);
+    void OnPaint(wxPaintEvent& event);
 
 private:
     wxArrayString m_textLines;
@@ -50,4 +55,7 @@ private:
     DECLARE_EVENT_TABLE()
 };
 
+#endif // wxUSE_POPUPWIN
+
 #endif // _WX_TIPWIN_H_
+